diff -rup systemd-239/src/core/macros.systemd.in systemd-239-new/src/core/macros.systemd.in
--- systemd-239/src/core/macros.systemd.in	2018-06-22 04:11:49.000000000 -0700
+++ systemd-239-new/src/core/macros.systemd.in	2018-08-28 16:23:44.354412088 -0700
@@ -41,7 +41,9 @@ OrderWithRequires(postun): systemd \
 %systemd_post() \
 if [ $1 -eq 1 ] ; then \
         # Initial installation \
-        systemctl --no-reload preset %{?*} &>/dev/null || : \
+        systemctl preset %{?*} >/dev/null 2>&1 || : \
+elif [ $1 -eq 2 ] ; then \
+        systemctl daemon-reload >/dev/null 2>&1 || : \
 fi \
 %{nil}
 
@@ -50,7 +52,8 @@ fi \
 %systemd_preun() \
 if [ $1 -eq 0 ] ; then \
         # Package removal, not upgrade \
-        systemctl --no-reload disable --now %{?*} &>/dev/null || : \
+        systemctl --no-reload disable %{?*} > /dev/null 2>&1 || : \
+        systemctl stop %{?*} > /dev/null 2>&1 || : \
 fi \
 %{nil}
 
@@ -61,11 +64,14 @@ if [ $1 -eq 0 ] ; then \
 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 || : \