diff --git a/ypserv.spec b/ypserv.spec
index e0cb059..1011dd6 100644
--- a/ypserv.spec
+++ b/ypserv.spec
@@ -1,10 +1,8 @@
-%define initdir /etc/rc.d/init.d
-
 Summary: The NIS (Network Information Service) server
 Url: http://www.linux-nis.org/nis/ypserv/index.html
 Name: ypserv
 Version: 2.24
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source0: ftp://ftp.kernel.org/pub/linux/utils/net/NIS/ypserv-%{version}.tar.bz2
@@ -27,7 +25,6 @@ Patch4: ypserv-2.19-inval-ports.patch
 Patch5: ypserv-2.13-nonedomain.patch
 Patch6: ypserv-2.19-slp-warning.patch
 BuildRequires: gdbm-devel
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
 The Network Information Service (NIS) is a system that provides
@@ -70,11 +67,11 @@ rm -rf $RPM_BUILD_ROOT
 
 #make install ROOT=$RPM_BUILD_ROOT
 %makeinstall libexecdir=$RPM_BUILD_ROOT%{_libdir}/yp INSTALL_PROGRAM=install
-mkdir -p $RPM_BUILD_ROOT%{initdir}
+mkdir -p $RPM_BUILD_ROOT%{_initrddir}
 install -m644 etc/ypserv.conf $RPM_BUILD_ROOT%{_sysconfdir}
-install -m755 %{SOURCE1} $RPM_BUILD_ROOT%{initdir}/ypserv
-install -m755 %{SOURCE2} $RPM_BUILD_ROOT%{initdir}/yppasswdd
-install -m755 %{SOURCE3} $RPM_BUILD_ROOT%{initdir}/ypxfrd
+install -m755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/ypserv
+install -m755 %{SOURCE2} $RPM_BUILD_ROOT%{_initrddir}/yppasswdd
+install -m755 %{SOURCE3} $RPM_BUILD_ROOT%{_initrddir}/ypxfrd
 
 mkdir -p $RPM_BUILD_ROOT/etc/sysconfig
 cat >$RPM_BUILD_ROOT/etc/sysconfig/yppasswdd <<EOF
@@ -97,9 +94,6 @@ cat >$RPM_BUILD_ROOT/etc/sysconfig/yppasswdd <<EOF
 YPPASSWDD_ARGS=
 EOF
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %post
 /sbin/chkconfig --add ypserv
 /sbin/chkconfig --add yppasswdd
@@ -131,13 +125,18 @@ exit 0
 %config(noreplace) %{_sysconfdir}/ypserv.conf
 %config(noreplace) %{_sysconfdir}/sysconfig/yppasswdd
 %config(noreplace) /var/yp/*
-%config %{initdir}/*
+%config %{_initrddir}/*
 %{_libdir}/yp
 %{_sbindir}/*
 %{_mandir}/*/*
 %{_includedir}/*/*
 
 %changelog
+* Tue Oct 19 2010 Karel Klic <kklic@redhat.com> - 2.24-2
+- Removed Buildroot tag
+- Removed %%clean section
+- Replace custom %%initdir macro with systemwide %%_initrddir
+
 * Tue Oct 19 2010 Karel Klic <kklic@redhat.com> - 2.24-1
 - New upstream version.