--- a/src/core/macros.systemd.in   	2016-11-03 13:04:12.219086800 -0700
+++ b/src/core/macros.systemd.in   	2016-11-03 14:02:53.122672819 -0700
@@ -39,7 +39,9 @@
 %systemd_post() \
 if [ $1 -eq 1 ] ; then \
         # Initial installation \
-        systemctl --no-reload preset %{?*} >/dev/null 2>&1 || : \
+        systemctl preset %{?*} >/dev/null 2>&1 || : \
+elif [ $1 -eq 2 ] ; then \
+        systemctl daemon-reload >/dev/null 2>&1 || : \
 fi \
 %{nil}
 
@@ -48,7 +50,8 @@
 %systemd_preun() \
 if [ $1 -eq 0 ] ; then \
         # Package removal, not upgrade \
-        systemctl --no-reload disable --now %{?*} > /dev/null 2>&1 || : \
+        systemctl --no-reload disable %{?*} > /dev/null 2>&1 || : \
+        systemctl stop %{?*} > /dev/null 2>&1 || : \
 fi \
 %{nil}
 
@@ -59,11 +62,14 @@
 fi \
 %{nil}
 
-%systemd_postun() %{nil}
+%systemd_postun() \
+systemctl daemon-reload >/dev/null 2>&1 || : \
+%{nil}
 
 %systemd_user_postun() %{nil}
 
 %systemd_postun_with_restart() \
+systemctl daemon-reload >/dev/null 2>&1 || : \
 if [ $1 -ge 1 ] ; then \
         # Package upgrade, not uninstall \
         systemctl try-restart %{?*} >/dev/null 2>&1 || : \