diff --git a/.rng-tools.metadata b/.rng-tools.metadata
index 7386879..8cb7b90 100644
--- a/.rng-tools.metadata
+++ b/.rng-tools.metadata
@@ -1,2 +1,2 @@
-f9c94e49297027f5280f4da5bdaab5bdc344e9c1 SOURCES/jitterentropy-library-3.4.1.tar.gz
-771cc517e9538717468dd174e61a00ad3a79f366 SOURCES/rng-tools-6.15.tar.gz
+2e3475074ae0c75fc417da553eb70ec160334b18 SOURCES/jitterentropy-library-3.4.1.tar.gz
+f8720f7aaef3f5ca0d63cf7b88d0de802a358ae0 SOURCES/rng-tools-6.15.tar.gz
diff --git a/SOURCES/rngd.service b/SOURCES/rngd.service
index 0cf8106..911cec1 100644
--- a/SOURCES/rngd.service
+++ b/SOURCES/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/SPECS/rng-tools.spec b/SPECS/rng-tools.spec
index c828c51..0bfa277 100644
--- a/SPECS/rng-tools.spec
+++ b/SPECS/rng-tools.spec
@@ -3,7 +3,7 @@
 Summary:        Random number generator related utilities
 Name:           rng-tools
 Version:        6.15
-Release:        2%{?dist}
+Release:        3%{?dist}
 Group:          System Environment/Base
 License:        GPLv2+
 URL:            https://github.com/nhorman/rng-tools
@@ -82,6 +82,14 @@ 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 rng-tools to v6.15 @ cb8cc624 (bz 2141379)
+- Update jitterentropy library to v3.4.1 @ 7bf9f85d
+- Fix a stack corruption on s390x
+- 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 rng-tools to v6.15 @ 6dcc9ec2 (bz 2124602)
 - Update jitterentropy library to v3.4.1 @ 4544e113