diff --git a/vsftpd.changes b/vsftpd.changes
index 6d0ba95..75c1f8e 100644
--- a/vsftpd.changes
+++ b/vsftpd.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Feb 21 10:51:51 UTC 2012 - mvyskocil@suse.cz
+
+- follow Systemd Packaging guidelines
+  http://en.opensuse.org/openSUSE:Systemd_packaging_guidelines
+
 -------------------------------------------------------------------
 Wed Feb 15 16:41:15 UTC 2012 - mvyskocil@suse.cz
 
diff --git a/vsftpd.spec b/vsftpd.spec
index 84fc971..996ac44 100644
--- a/vsftpd.spec
+++ b/vsftpd.spec
@@ -15,6 +15,7 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
+
 Name:           vsftpd
 BuildRequires:  openssl-devel
 BuildRequires:  pam-devel
@@ -23,6 +24,9 @@ BuildRequires:  libcap
 %else
 BuildRequires:  libcap-devel
 %endif
+%if 0%{?suse_version} > 1140
+BuildRequires:  systemd
+%endif
 Version:        2.3.5
 Release:        0
 Summary:        Very Secure FTP Daemon - Written from Scratch
@@ -48,6 +52,7 @@ Patch9:         vsftpd-2.3.5-conf.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Provides:       ftp-server
 PreReq:         %insserv_prereq /usr/sbin/useradd
+%{?systemd_requires}
 Requires:       logrotate
 
 %description
@@ -93,20 +98,34 @@ install -d $RPM_BUILD_ROOT/%_datadir/omc/svcinfo.d/
 install -D -m 644 %SOURCE5 $RPM_BUILD_ROOT/%_datadir/omc/svcinfo.d/
 install -d $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/
 install -m 644 %{S:6} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/%{name}
-install -D -m 0644 %SOURCE7 %{buildroot}/lib/systemd/system/vsftpd.service
+%if 0%{?suse_version} > 1140
+install -D -m 0644 %SOURCE7 %{buildroot}/%{name}.service
+%endif
 
 %pre
 /usr/sbin/useradd -r -o -g nogroup -s /bin/false -c "Secure FTP User" -d /var/lib/empty ftpsecure 2> /dev/null || :
+%if 0%{?suse_version} > 1140
+%service_add_pre %{name}.service
+%endif
 
 %preun
 %stop_on_removal %name
+%if 0%{?suse_version} > 1140
+%service_del_preun %{name}.service
+%endif
 
 %post
 %{fillup_and_insserv -f %{name}}
+%if 0%{?suse_version} > 1140
+%service_add_post %{name}.service
+%endif
 
 %postun
 %insserv_cleanup
 %restart_on_update %name
+%if 0%{?suse_version} > 1140
+%service_del_postun %{name}.service
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT