diff --git a/389-admin.spec b/389-admin.spec
index e27d85e..18152d9 100644
--- a/389-admin.spec
+++ b/389-admin.spec
@@ -85,7 +85,6 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 rm -f $RPM_BUILD_ROOT%{_libdir}/%{pkgname}/modules/*.a
 rm -f $RPM_BUILD_ROOT%{_libdir}/%{pkgname}/modules/*.la
 
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -97,7 +96,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %post -p <lua>
 -- do the usual daemon post setup stuff
-os.execute('/bin/systemctl enable %{pkgname}-admin.service >/dev/null 2>&1 || :')
+os.execute('/bin/systemctl preset %{pkgname}-admin.service >/dev/null 2>&1 || :')
 os.execute('/sbin/ldconfig')
 -- restore permissions if upgrading
 if %{pkgname}admin_adminserv then
@@ -110,11 +109,7 @@ if %{pkgname}admin_consoleconf then
 end
 
 %preun
-if [ $1 -eq 0 ]; then
-   # Package removal, not upgrade
-   /bin/systemctl stop %{pkgname}-admin.service > /dev/null 2>&1 || :
-   /bin/systemctl --no-reload disable %{pkgname}-admin.service >/dev/null 2>&1 || :
-fi
+%systemd_preun %{pkgname}-admin.service
 
 %postun
 /sbin/ldconfig