diff --git a/rng-tools.spec b/rng-tools.spec
index 1069b9d..701be5d 100644
--- a/rng-tools.spec
+++ b/rng-tools.spec
@@ -1,6 +1,6 @@
 Name:          rng-tools
 Version:       6.16
-Release:       1mamba
+Release:       3mamba
 Summary:       A random number generator daemon
 Group:         System/Kernel and Hardware
 Vendor:        openmamba
@@ -73,6 +73,12 @@ install -D -m0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/sysconfig/rngd
 %doc AUTHORS COPYING
 
 %changelog
+* Thu Apr 27 2023 Silvan Calarco <silvan.calarco@mambasoft.it> 6.16-3mamba
+- fix applying updated rngd.service
+
+* Wed Apr 26 2023 Silvan Calarco <silvan.calarco@mambasoft.it> 6.16-2mamba
+- rngd.service: update to fix blocking system shutdown
+
 * Wed Jan 11 2023 Automatic Build System <autodist@mambasoft.it> 6.16-1mamba
 - automatic version update by autodist
 
diff --git a/rngd.service b/rngd.service
index 4d46098..8ac53bd 100644
--- a/rngd.service
+++ b/rngd.service
@@ -1,7 +1,9 @@
 [Unit]
 Description=Hardware RNG Entropy Gatherer Daemon
 DefaultDependencies=no
+Conflicts=shutdown.target
 Before=sysinit.target shutdown.target
+ConditionVirtualization=!container
 
 [Service]
 EnvironmentFile=/etc/sysconfig/rngd