diff --git a/openssh.spec b/openssh.spec
index 317863f..8609854 100644
--- a/openssh.spec
+++ b/openssh.spec
@@ -12,7 +12,7 @@
 %define build_skey	 	0
 %define build_krb5	 	1
 %define build_watchdog   	0
-%define build_gnomeaskpass 	0
+%define build_gnomeaskpass 	1
 %define build_ldap       	0
 %define build_sftpcontrol    	0
 %define build_hpn		0
@@ -44,7 +44,7 @@
 Summary:	OpenSSH free Secure Shell (SSH) implementation
 Name:		openssh
 Version:	6.0p1
-Release:	1
+Release:	5
 License:	BSD
 Group:		Networking/Remote access
 URL:		http://www.openssh.com/
@@ -116,6 +116,12 @@ BuildRequires:	audit-devel
 BuildRequires:	edit-devel ncurses-devel
 %endif
 BuildConflicts:	libgssapi-devel
+BuildRequires:  systemd-units
+BuildRequires:  rpm-helper > 0.24
+Requires(pre):  rpm-helper > 0.24
+Requires(post): rpm-helper > 0.24
+Requires(preun):        rpm-helper > 0.24
+Requires(postun):       rpm-helper > 0.24
 
 %description
 Ssh (Secure Shell) is a program for logging into a remote machine and for
@@ -419,13 +425,14 @@ chmod 755 %{buildroot}%{_libdir}/ssh/ssh-keysign
 %post server
 # do some key management
 %{_bindir}/ssh-keygen -A
-%_post_service sshd
+%_post_service sshd sshd.service
 
 %preun server
-%_preun_service sshd
+%_preun_service sshd sshd.service
 
 %postun server
 %_postun_userdel sshd
+%_postun_unit sshd.service
 
 %if %{build_gnomeaskpass}
 %post askpass-gnome
@@ -507,6 +514,18 @@ update-alternatives --remove bssh-askpass %{_libdir}/ssh/gnome-ssh-askpass
 
 
 %changelog
+* Thu Jun 28 2012 Dmitry Mikhirev <dmikhirev@mandriva.org> 6.0p1-5
++ Revision: 807343
++ rebuild (emptylog)
+
+* Tue Jun 26 2012 Guilherme Moro <guilherme@mandriva.com> 6.0p1-3
++ Revision: 807059
+- Fix systemd scriptlets
+
+* Sat Jun 09 2012 Dmitry Mikhirev <dmikhirev@mandriva.org> 6.0p1-2
++ Revision: 803895
+- enable askpass-gnome as it is useful with MATE
+
 * Sun Apr 22 2012 Bernhard Rosenkraenzer <bero@bero.eu> 6.0p1-1
 + Revision: 792720
 - Update to 6.0