diff --git a/ypbind.service b/ypbind.service
index 43ebf3d..91cce5c 100644
--- a/ypbind.service
+++ b/ypbind.service
@@ -6,11 +6,11 @@ After=syslog.target network.target rpcbind.service ypserv.service
 [Service]
 EnvironmentFile=-/etc/sysconfig/network
 EnvironmentFile=-/etc/sysconfig/ypbind
-ExecStartPre=-/usr/lib/ypbind/ypbind-pre-setdomain
+ExecStartPre=/usr/lib/ypbind/ypbind-pre-setdomain
 ExecStartPre=-/usr/sbin/setsebool allow_ypbind=1 
 ExecStart=/usr/sbin/ypbind -n $OTHER_YPBIND_OPTS
-ExecStopPost=-/usr/sbin/setsebool allow_ypbind=0
-ExecStopPost=/usr/lib/ypbind/ypbind-post-waitbind
+ExecStartPost=-/usr/sbin/setsebool allow_ypbind=0
+ExecStartPost=/usr/lib/ypbind/ypbind-post-waitbind
 
 [Install]
 WantedBy=multi-user.target
diff --git a/ypbind.spec b/ypbind.spec
index c5ba8a0..0813d80 100644
--- a/ypbind.spec
+++ b/ypbind.spec
@@ -1,7 +1,7 @@
 Summary: The NIS daemon which binds NIS clients to an NIS domain
 Name: ypbind
 Version: 1.33
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source0: ftp://ftp.us.kernel.org/pub/linux/utils/net/NIS/ypbind-mt-%{version}.tar.bz2
@@ -117,6 +117,9 @@ fi
 %doc README NEWS COPYING
 
 %changelog
+* Thu Sep 15 2011 Honza Horak <hhorak@redhat.com> - 3:1.33-6
+- Fixed systemd unit file
+
 * Tue Aug 02 2011 Honza Horak <hhorak@redhat.com> - 3:1.33-5
 - Fixed rpmlint errors
 - Fixed systemd unit files packaging