diff --git a/sblim-sfcb.spec b/sblim-sfcb.spec
index 62320b8..8c43123 100644
--- a/sblim-sfcb.spec
+++ b/sblim-sfcb.spec
@@ -8,7 +8,7 @@ Name: sblim-sfcb
 Summary: Small Footprint CIM Broker
 URL: http://www.sblim.org
 Version: 1.3.15
-Release: 2%{?dist}
+Release: 3%{?dist}
 Group: Applications/System
 License: EPL
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}
@@ -96,34 +96,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/sfcb/genSslCert.sh %{_sysconfdir}/sfcb &>/dev/null || :
 /sbin/ldconfig
 %{_bindir}/sfcbrepos -f
-
-if [ $1 -eq 1 ]; then
-        # Package install, not upgrade
-        /bin/systemctl daemon-reload >/dev/null 2>&1 || :
-fi
-
-%triggerun -- sblim-sfcb < 1.3.10-3
-if /sbin/chkconfig --level 3 sblim-sfcb ; then
-        /bin/systemctl enable sfcb.service >/dev/null 2>&1 || :
-fi
+%systemd_post sfcb.service
 
 %preun
-if [ $1 -eq 0 ] ; then
-        # Package removal, not upgrade
-        /bin/systemctl disable sfcb.service > /dev/null 2>&1 || :
-        /bin/systemctl stop sfcb.service > /dev/null 2>&1 || :
-fi
-
+%systemd_preun sfcb.service
 
 %postun
 /sbin/ldconfig
-
-/bin/systemctl daemon-reload >/dev/null 2>&1 || :
-if [ $1 -ge 1 ] ; then
-        # Package upgrade, not uninstall
-        /bin/systemctl try-restart sfcb.service >/dev/null 2>&1 || :
-fi
-
+%systemd_postun_with_restart sfcb.service
 if [ $1 -eq 0 ]; then
         /usr/sbin/groupdel sfcb > /dev/null 2>&1 || :;
 fi;
@@ -138,6 +118,10 @@ fi;
 #%doc COPYING README
 
 %changelog
+* Thu Aug 23 2012 Vitezslav Crhonek <vcrhonek@redhat.com> - 1.3.15-3
+- Use new systemd-rpm macros
+  Resolves: #850307
+
 * Sat Jul 21 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.3.15-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild