diff --git a/haveged.spec b/haveged.spec
index 7d8c70e..dda6f72 100644
--- a/haveged.spec
+++ b/haveged.spec
@@ -1,6 +1,6 @@
 Name:          haveged
 Version:       1.9.15
-Release:       1mamba
+Release:       2mamba
 Summary:       A simple entropy daemon
 Group:         System/Kernel and Hardware
 Vendor:        openmamba
@@ -49,28 +49,20 @@ This package contains libraries and header files for developing applications tha
 [ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
 %makeinstall
 
-install -D -m0755 %{SOURCE1} %{buildroot}%{_unitdir}/haveged.service
-
 %clean
 [ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
 
-%post
-/sbin/ldconfig
-%systemd_post %{name}
-:
+%post -p /sbin/ldconfig
 
-%preun
-%systemd_preun %{name}
-:
+%postun -p /sbin/ldconfig
 
-%postun
-/sbin/ldconfig
-%systemd_postun_with_restart %{name}
+%triggerpreun -- haveged < 1.9.15-2mamba
+systemctl disable haveged || true
+:
 
 %files
 %defattr(-,root,root)
 %{_sbindir}/haveged
-%{_unitdir}/haveged.service
 %{_mandir}/man8/haveged.8*
 
 %files -n lib%{name}
@@ -90,6 +82,9 @@ install -D -m0755 %{SOURCE1} %{buildroot}%{_unitdir}/haveged.service
 
 
 %changelog
+* Fri Dec 03 2021 Silvan Calarco <silvan.calarco@mambasoft.it> 1.9.15-2mamba
+- disable and remove service no longer needed since kernel 5.6+
+
 * Mon Oct 04 2021 Automatic Build System <autodist@mambasoft.it> 1.9.15-1mamba
 - automatic version update by autodist