diff --git a/cyrus-sasl.spec b/cyrus-sasl.spec
index e8dd2ff..b0a4c95 100644
--- a/cyrus-sasl.spec
+++ b/cyrus-sasl.spec
@@ -8,7 +8,7 @@
 Summary: The Cyrus SASL library
 Name: cyrus-sasl
 Version: 2.1.23
-Release: 17%{?dist}
+Release: 18%{?dist}
 License: BSD with advertising
 Group: System Environment/Libraries
 # Source0 originally comes from ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/;
@@ -324,19 +324,42 @@ useradd -r -g %{username} -d %{homedir} -s /sbin/nologin \
 exit 0
 
 %post
-/sbin/chkconfig --add saslauthd
+if [ -x /bin/systemctl ]; then
+	if [ $1 -eq 1 ]; then
+		/bin/systemctl daemon-reload >/dev/null 2>&1 || :
+	fi
+fi
+if [ -x /sbin/chkconfig ]; then
+	/sbin/chkconfig --add saslauthd
+fi
 exit 0
 
 %preun
-if [ $1 -eq 0 ] ; then
-        /sbin/service saslauthd stop 2>&1 > /dev/null
-        /sbin/chkconfig --del saslauthd
+if [ $1 -eq 0 ]; then
+	if [ -x /bin/systemctl ]; then
+		/bin/systemctl disable saslauthd.service >/dev/null 2>&1 || :
+		/bin/systemctl stop saslauthd.service >/dev/null 2>&1 || :
+	fi
+	if [ -x /sbin/service ]; then
+        	/sbin/service saslauthd stop >/dev/null 2>&1 || :
+	fi
+	if [ -x /sbin/chkconfig ]; then
+        	/sbin/chkconfig --del saslauthd
+	fi
 fi
 exit 0
 
 %postun
-if [ $1 -ne 0 ] ; then
-        /sbin/service saslauthd condrestart 2>&1 > /dev/null
+if [ -x /bin/systemctl ]; then
+	/bin/systemctl daemon-reload >/dev/null 2>&1 || :
+	if [ $1 -ge 1 ]; then
+		/bin/systemctl try-restart saslauthd.service >/dev/null 2>&1 || :
+	fi
+fi
+if [ -x /sbin/service ];then
+	if [ $1 -ne 0 ]; then
+        	/sbin/service saslauthd condrestart 2>&1 > /dev/null
+	fi
 fi
 exit 0
 
@@ -407,6 +430,9 @@ exit 0
 %{_sbindir}/sasl2-shared-mechlist
 
 %changelog
+* Tue Apr 26 2011 Jan F. Chadima <jchadima@redhat.com> - 2.1.23-18
+- update scriptlets
+
 * Fri Apr 22 2011 Jan F. Chadima <jchadima@redhat.com> - 2.1.23-17
 - Add systemd units