diff --git a/rng-tools.spec b/rng-tools.spec
index 490a238..00e8d09 100644
--- a/rng-tools.spec
+++ b/rng-tools.spec
@@ -4,7 +4,7 @@
 Summary:        Random number generator related utilities
 Name:           rng-tools
 Version:        4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Group:          System Environment/Base
 License:        GPLv2+
 URL:            http://sourceforge.net/projects/gkernel/
@@ -40,24 +40,13 @@ mkdir -p %{buildroot}%{_unitdir}
 install -m 644 %{SOURCE1} %{buildroot}%{_unitdir}
 
 %post
-if [ $1 -eq 1 ] ; then 
-    # Initial installation 
-    /bin/systemctl daemon-reload >/dev/null 2>&1 || :
-fi
+%systemd_post rngd.service
 
 %preun
-if [ $1 -eq 0 ] ; then
-    # Package removal, not upgrade
-    /bin/systemctl --no-reload disable rngd.service > /dev/null 2>&1 || :
-    /bin/systemctl stop rngd.service > /dev/null 2>&1 || :
-fi
+%systemd_preun rngd.service
 
 %postun
-/bin/systemctl daemon-reload >/dev/null 2>&1 || :
-if [ $1 -ge 1 ] ; then
-    # Package upgrade, not uninstall
-    /bin/systemctl try-restart rngd.service >/dev/null 2>&1 || :
-fi
+%systemd_postun_with_restart rngd.service
 
 %files
 %doc AUTHORS ChangeLog COPYING NEWS README
@@ -68,6 +57,9 @@ fi
 %attr(0644,root,root)   %{_unitdir}/rngd.service
 
 %changelog
+* Tue Sep 25 2012 Jaromir Capik <jcapik@redhat.com> - 4-2
+- Migration to new systemd macros
+
 * Mon Aug 6 2012 Jeff Garzik <jgarzik@redhat.com> - 4-1
 - Update to release version 4.