diff --git a/spamassassin.spec b/spamassassin.spec
index 1d08068..6a81ce0 100644
--- a/spamassassin.spec
+++ b/spamassassin.spec
@@ -69,7 +69,7 @@ Summary: Spam filter for email which can be invoked from mail delivery agents
 Name: spamassassin
 Version: 3.3.2
 #Release: 0.8.%{prerev}%{?dist}
-Release: 12%{?dist}
+Release: 13%{?dist}
 License: ASL 2.0
 Group: Applications/Internet
 URL: http://spamassassin.apache.org/
@@ -286,11 +286,15 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %if %{use_systemd}
+%if 0%{?fedora} > 17
+        %systemd_post spamassassin.service
+%else
 if [ $1 -eq 1 ] ; then 
     # Initial installation 
     /bin/systemctl daemon-reload >/dev/null 2>&1 || :
 fi
 %endif
+%endif
 
 # -a and --auto-whitelist options were removed from 3.0.0
 # prevent service startup failure
@@ -318,12 +322,16 @@ exit 0
 %endif
 
 %if %{use_systemd}
+%if 0%{?fedora} > 17
+        %systemd_postun spamassassin.service
+%else
 /bin/systemctl daemon-reload >/dev/null 2>&1 || :
 if [ $1 -ge 1 ] ; then
     # Package upgrade, not uninstall
     /bin/systemctl try-restart spamassassin.service >/dev/null 2>&1 || :
 fi
 %endif
+%endif
 
 %preun
 %if %{use_systemd} == 0
@@ -335,12 +343,16 @@ exit 0
 %endif
 
 %if %{use_systemd}
+%if 0%{?fedora} > 17
+        %systemd_preun spamassassin.service
+%else
 if [ $1 -eq 0 ] ; then
     # Package removal, not upgrade
     /bin/systemctl --no-reload disable spamassassin.service > /dev/null 2>&1 || :
     /bin/systemctl stop spamassassin.service > /dev/null 2>&1 || :
 fi
 %endif
+%endif
 
 %if %{use_systemd}
 %triggerun -- spamassassin < 3.3.2-2
@@ -352,6 +364,9 @@ fi
 %endif
 
 %changelog
+* Sat Aug 25 2012 Kevin Fenzi <kevin@scrye.com> 3.3.2-13
+- Add systemd macros for presets. Fixes bug #850320
+
 * Fri Aug 03 2012 Kevin Fenzi <kevin@scrye.com> - 3.3.2-12
 - Fix sa-update not detecting spamd running. Fixes bug #755644
 - Add restart=always to systemd file to work around upstream bug. Bug #812359