diff --git a/ypbind.service b/ypbind.service
index a8ba806..0a69a8e 100644
--- a/ypbind.service
+++ b/ypbind.service
@@ -7,10 +7,10 @@ Before=systemd-user-sessions.service
 [Service]
 EnvironmentFile=-/etc/sysconfig/network
 EnvironmentFile=-/etc/sysconfig/ypbind
-ExecStartPre=/usr/lib/ypbind/ypbind-pre-setdomain
+ExecStartPre=/usr/libexec/ypbind-pre-setdomain
 ExecStartPre=-/usr/sbin/setsebool allow_ypbind=1 
 ExecStart=/usr/sbin/ypbind -n $OTHER_YPBIND_OPTS
-ExecStartPost=/usr/lib/ypbind/ypbind-post-waitbind
+ExecStartPost=/usr/libexec/ypbind-post-waitbind
 
 [Install]
 WantedBy=multi-user.target
diff --git a/ypbind.spec b/ypbind.spec
index 80101cf..edddd17 100644
--- a/ypbind.spec
+++ b/ypbind.spec
@@ -1,10 +1,10 @@
 Summary: The NIS daemon which binds NIS clients to an NIS domain
 Name: ypbind
 Version: 1.36
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
-Source0: ftp://ftp.us.kernel.org/pub/linux/utils/net/NIS/ypbind-mt-%{version}.tar.bz2
+Source0: http://www.linux-nis.org/download/ypbind-mt/ypbind-mt-%{version}.tar.bz2
 Url: http://www.linux-nis.org/nis/ypbind-mt/index.html
 #Source1: ypbind.init
 Source2: nis.sh
@@ -27,9 +27,6 @@ Epoch: 3
 BuildRequires: dbus-glib-devel, docbook-style-xsl
 BuildRequires: systemd-units
 
-# Location where helper scripts are located
-%define scripts_path /usr/lib/%{name}
-
 %description
 The Network Information Service (NIS) is a system that provides
 network information (login names, passwords, home directories, group
@@ -61,12 +58,15 @@ make
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
-mkdir -p $RPM_BUILD_ROOT/var/yp/binding $RPM_BUILD_ROOT/etc/dhcp/dhclient.d/ $RPM_BUILD_ROOT%{_unitdir} $RPM_BUILD_ROOT%{scripts_path}/
+mkdir -p $RPM_BUILD_ROOT/var/yp/binding
+mkdir -p $RPM_BUILD_ROOT/etc/dhcp/dhclient.d
+mkdir -p $RPM_BUILD_ROOT%{_unitdir}
+mkdir -p $RPM_BUILD_ROOT%{_libexecdir}
 install -m 644 etc/yp.conf $RPM_BUILD_ROOT/etc/yp.conf
 install -m 755 %{SOURCE2} $RPM_BUILD_ROOT/etc/dhcp/dhclient.d/nis.sh
 install -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_unitdir}/ypbind.service
-install -m 755 %{SOURCE4} $RPM_BUILD_ROOT%{scripts_path}/ypbind-pre-setdomain
-install -m 755 %{SOURCE5} $RPM_BUILD_ROOT%{scripts_path}/ypbind-post-waitbind
+install -m 755 %{SOURCE4} $RPM_BUILD_ROOT%{_libexecdir}/ypbind-pre-setdomain
+install -m 755 %{SOURCE5} $RPM_BUILD_ROOT%{_libexecdir}/ypbind-post-waitbind
 
 %{find_lang} %{name}
 
@@ -105,7 +105,7 @@ fi
 %defattr(-,root,root)
 %{_sbindir}/*
 %{_mandir}/*/*
-%{scripts_path}/*
+%{_libexecdir}/*
 %{_unitdir}/*
 /etc/dhcp/dhclient.d/*
 %config(noreplace) /etc/yp.conf
@@ -113,6 +113,10 @@ fi
 %doc README NEWS COPYING
 
 %changelog
+* Wed Jul 11 2012 Honza Horak <hhorak@redhat.com> - 3:1.36-2
+- Minor spec file fixes
+- Helper scripts moved to /usr/libexec
+
 * Wed Jul 11 2012 Honza Horak <hhorak@redhat.com> - 3:1.36-1
 - Update to new version 1.36