diff --git a/cyrus-sasl.spec b/cyrus-sasl.spec
index d018f8c..e8dd2ff 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: 16%{?dist}
+Release: 17%{?dist}
 License: BSD with advertising
 Group: System Environment/Libraries
 # Source0 originally comes from ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/;
@@ -16,6 +16,7 @@ Group: System Environment/Libraries
 # new tarball.
 Source0: cyrus-sasl-%{version}-nodlcompatorsrp.tar.gz
 Source4: saslauthd.init
+Source5: saslauthd.service
 Source7: sasl-mechlist.c
 Source8: sasl-checkpass.c
 Source9: saslauthd.sysconfig
@@ -290,6 +291,8 @@ install -m755 -d $RPM_BUILD_ROOT/var/run/saslauthd
 # Install the init script for saslauthd and the init script's config file.
 install -m755 -d $RPM_BUILD_ROOT/etc/rc.d/init.d $RPM_BUILD_ROOT/etc/sysconfig
 install -m755 -p %{SOURCE4} $RPM_BUILD_ROOT/etc/rc.d/init.d/saslauthd
+install -d -m755 $RPM_BUILD_ROOT/%{_unitdir}
+install -m644 -p %{SOURCE5} $RPM_BUILD_ROOT/%{_unitdir}/saslauthd
 install -m644 -p %{SOURCE9} $RPM_BUILD_ROOT/etc/sysconfig/saslauthd
 install -m755 -d $RPM_BUILD_ROOT/etc/tmpfiles.d
 install -m644 -p %{SOURCE11} $RPM_BUILD_ROOT/etc/tmpfiles.d/saslauthd.conf
@@ -350,6 +353,7 @@ exit 0
 %{_sbindir}/testsaslauthd
 %config(noreplace) /etc/sysconfig/saslauthd
 /etc/rc.d/init.d/saslauthd
+%{_unitdir}/saslauthd
 /etc/tmpfiles.d/saslauthd.conf
 %ghost /var/run/saslauthd
 
@@ -403,6 +407,9 @@ exit 0
 %{_sbindir}/sasl2-shared-mechlist
 
 %changelog
+* Fri Apr 22 2011 Jan F. Chadima <jchadima@redhat.com> - 2.1.23-17
+- Add systemd units
+
 * Wed Mar 23 2011 Tomas Mraz <tmraz@redhat.com> - 2.1.23-16
 - Rebuilt with new mysqlclient
 
diff --git a/saslauthd.service b/saslauthd.service
new file mode 100644
index 0000000..2a36f30
--- /dev/null
+++ b/saslauthd.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=SASL authentication daemon.
+After=syslog.target 
+
+[Service]
+Type=forking
+PIDFile=/etc/sysconfig/saslauthd
+EnvironmentFile=/etc/sysconfig/saslauthd
+ExecStart=/usr/sbin/saslauthd -a $MECH $FLAGS
+
+[Install]
+WantedBy=multi-user.target