diff --git a/gssproxy.spec b/gssproxy.spec
index a6c1684..f5e4f10 100644
--- a/gssproxy.spec
+++ b/gssproxy.spec
@@ -80,26 +80,19 @@ rm -rf %{buildroot}
 %{_mandir}/man8/gssproxy.8*
 
 %post
-if [ $1 -eq 1 ] ; then
-    # Initial installation
-    /bin/systemctl daemon-reload >/dev/null 2>&1 || :
-fi
+%systemd_post gssproxy.service
 
 %preun
-if [ $1 -eq 0 ] ; then
-    # Package removal, not upgrade
-    /bin/systemctl --no-reload disable gssproxy.service > /dev/null 2>&1 || :
-    /bin/systemctl stop gssproxy.service > /dev/null 2>&1 || :
-fi
+%systemd_preun gssproxy.service
 
 %postun
-/bin/systemctl daemon-reload >/dev/null 2>&1 || :
-if [ $1 -ge 1 ] ; then
-    # Package upgrade, not uninstall
-    /bin/systemctl try-restart gssproxy.service >/dev/null 2>&1 || :
-fi
+%systemd_postun_with_restart gssproxy.service
 
 %changelog
+* Wed Aug 22 2012 Guenther Deschner <gdeschner@redhat.com> 0.0.2-6
+- Use new systemd-rpm macros
+- resolves: #850139
+
 * Wed Jul 18 2012 Guenther Deschner <gdeschner@redhat.com> 0.0.2-5
 - More spec file fixes