diff --git a/rng-tools.spec b/rng-tools.spec
index 235c61e..119723e 100644
--- a/rng-tools.spec
+++ b/rng-tools.spec
@@ -12,7 +12,7 @@
 Summary:        Random number generator related utilities
 Name:           rng-tools
 Version:        6.15
-Release:        2%{?dist}
+Release:        3%{?dist}
 License:        GPLv2+
 URL:            https://github.com/nhorman/rng-tools
 Source0:        %{url}/archive/v%{version}/%{name}-%{version}.tar.gz
@@ -97,6 +97,12 @@ install -D %{SOURCE2} -m0644 %{buildroot}%{_sysconfdir}/sysconfig/rngd
 %config(noreplace) %attr(0644,root,root)    %{_sysconfdir}/sysconfig/rngd
 
 %changelog
+* Tue Dec 27 2022 Vladis Dronov <vdronov@redhat.com> - 6.15-3
+- Update to the upstream v6.15 + tip of origin/master @ cb8cc624 (bz 2156554)
+- Fix a number of issues found by covscan code scanner
+- Add a jitter init timeout for tests
+- Add a start condition for the FIPS mode (bz 2154804)
+
 * Tue Oct 04 2022 Vladis Dronov <vdronov@redhat.com> - 6.15-2
 - Update to the upstream v6.15 + tip of origin/master @ 6dcc9ec2 (bz 2124605)
 - Do not require selinux-policy if it is not present
diff --git a/rngd.service b/rngd.service
index 2bd9e09..ffa8901 100644
--- a/rngd.service
+++ b/rngd.service
@@ -1,6 +1,7 @@
 [Unit]
 Description=Hardware RNG Entropy Gatherer Daemon
 ConditionVirtualization=!container
+ConditionKernelCommandLine=!fips=1
 
 # The "-f" option is required for the systemd service rngd to work with Type=simple
 [Service]
diff --git a/sources b/sources
index 6e06a10..9ef7609 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (rng-tools-6.15.tar.gz) = c64a15861b152edb242ff694cc2f2363e7aff0892aaecb9bbc5a7fe8c60b97fc0b320e466432f220ade0988ae4ef4acc863b509668a4bd70002a7b4c2847f8ab
+SHA512 (rng-tools-6.15.tar.gz) = eb4e3409c1d2b44644d3fd75afc9a47df2f273a47b1b9397a7eaf35c075bb9a9130c66975afd3cb0e5316d653d9b9c7c786695d4b514e51843c5a7976aea8554
diff --git a/tests/selftest/runtest.sh b/tests/selftest/runtest.sh
index d5b691a..7fd3658 100755
--- a/tests/selftest/runtest.sh
+++ b/tests/selftest/runtest.sh
@@ -58,7 +58,7 @@ rlJournalStart
 	tail -n 100 $BUILDLOG
 	rlRun "pushd ."
 	rlRun "cd $TESTDIR"
-	rlRun "make check &> $TESTLOG"
+	rlRun "RNGD_JITTER_TIMEOUT=60 make check &> $TESTLOG"
 	if [ $? -eq 0 ]
 	then
 		rlPass "Selftest Passed"