diff --git a/autofs.spec b/autofs.spec
index 52f5fb4..59f93a9 100644
--- a/autofs.spec
+++ b/autofs.spec
@@ -1,6 +1,6 @@
 Name:          autofs
 Version:       5.1.1
-Release:       1mamba
+Release:       2mamba
 Summary:       Userspace tools that work with the kernel to mount and un-mount removable file systems
 Group:         System/Kernel and Hardware
 Vendor:        openmamba
@@ -12,13 +12,13 @@ License:       GPL
 ## AUTOBUILDREQ-BEGIN
 BuildRequires: glibc-devel
 BuildRequires: libe2fs-devel
-BuildRequires: libkeyutils-devel
 BuildRequires: libkrb5-devel
 BuildRequires: libopenldap-devel
-BuildRequires: libsasl-devel
+BuildRequires: libsasl2-devel
 BuildRequires: libxml2-devel
 BuildRequires: libz-devel
 ## AUTOBUILDREQ-END
+%systemd_requires
 BuildRoot:     %{_tmppath}/%{name}-%{version}-root
 
 %description
@@ -31,7 +31,9 @@ It may also be useful for allowing users to mount floppies, cdroms and other rem
 %setup -q
 
 %build
-%configure
+%configure \
+   --with-systemd=%{_unitdir}
+
 %make
 
 %install
@@ -41,6 +43,22 @@ It may also be useful for allowing users to mount floppies, cdroms and other rem
 %clean
 [ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
 
+%post
+%systemd_post autofs
+if [ $1 -ge 1 ]; then
+   systemctl -q daemon-reload
+   systemctl -q enable autofs
+fi
+:
+
+%preun
+%systemd_preun autofs
+:
+
+%postun
+%systemd_postun_with_restart autofs
+:
+
 %files
 %defattr(-,root,root)
 %config(noreplace) %{_sysconfdir}/auto.master
@@ -49,7 +67,7 @@ It may also be useful for allowing users to mount floppies, cdroms and other rem
 %config(noreplace) %{_sysconfdir}/auto.smb
 %config(noreplace) %{_sysconfdir}/autofs_ldap_auth.conf
 %config(noreplace) %{_sysconfdir}/autofs.conf
-%{_sysconfdir}/init.d/autofs
+%{_unitdir}/autofs.service
 %{_sysconfdir}/sysconfig/autofs
 %{_sbindir}/automount
 %dir %{_libdir}/autofs
@@ -67,6 +85,9 @@ It may also be useful for allowing users to mount floppies, cdroms and other rem
 #%doc README README.active-restart README.changer README.ncpfs README.replicated-server README.smbfs README.v5.release
 
 %changelog
+* Thu May 21 2015 Silvan Calarco <silvan.calarco@mambasoft.it> 5.1.1-2mamba
+- rebuilt with systemd
+
 * Wed Apr 22 2015 Automatic Build System <autodist@mambasoft.it> 5.1.1-1mamba
 - automatic version update by autodist