diff --git a/netatalk.spec b/netatalk.spec
index 6c54046..6db71aa 100644
--- a/netatalk.spec
+++ b/netatalk.spec
@@ -1,12 +1,10 @@
- %define initdir /etc/rc.d/init.d
-
 Summary: AppleTalk networking programs
 Name:    netatalk
 Version: 2.0.3
-Release: 9%{?dist}
+Release: 10%{?dist}
 Epoch:   4
 License: GPL
-Group: 	 System Environment/Daemons
+Group:   System Environment/Daemons
 Source0: http://download.sourceforge.net/netatalk/netatalk-%{version}.tar.bz2
 Source1: atalk.init
 #Source2: netatalk.config
@@ -21,11 +19,15 @@ Patch1:  netatalk-2.0.2-db4_2-db4_3.patch
 Patch2:  netatalk-2.0.2-uams_no_pie.patch
 Patch3:  netatalk-2.0.2-extern_ucreator.patch
 Patch4:  netatalk-2.0.3-nodefault.patch
+Patch5:  netatalk-2.0.3-wrong_script_interpreter.patch
 Url:	 http://netatalk.sourceforge.net/
-Prereq:  /sbin/chkconfig, /sbin/service 
-Requires: pam >= 0.56, /etc/pam.d/system-auth, tcp_wrappers, openssl, cracklib
-BuildRequires: cracklib-devel openssl-devel pam quota libtool automake autoconf db4-devel pam-devel
-BuildRoot: %{_tmppath}/%{name}-root
+Requires: pam
+Requires(post): /sbin/chkconfig /sbin/ldconfig
+Requires(preun): /sbin/chkconfig
+Requires(preun): /sbin/service
+Requires(postun): /sbin/service /sbin/ldconfig
+BuildRequires: cracklib-devel openssl-devel pam quota libtool automake autoconf db4-devel pam-devel tcp_wrappers-devel
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
 This package enables Linux to talk to Macintosh computers via the
@@ -50,6 +52,7 @@ Appletalk networking programs.
 %patch2  -p1 -b .uams_no_pie
 %patch3  -p1 -b .extern_ucreator
 %patch4  -p1
+%patch5  -p1
 
 ln -s ./NEWS ChangeLog
 
@@ -92,13 +95,13 @@ if [ "%{_lib}" != lib ]; then
 	-e 's,-L/lib,-L/%{_lib},g'
 fi
 
-make all
+make %{?_smp_mflags} all
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 #mkdir -p $RPM_BUILD_ROOT/etc/pam.d
-#mkdir -p $RPM_BUILD_ROOT%{initdir}
+#mkdir -p $RPM_BUILD_ROOT%{_initrddir}
 #mkdir -p $RPM_BUILD_ROOT/usr/include/{netatalk,atalk}
 
 make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install
@@ -114,7 +117,7 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install
 #
 # Use netatalk's redhat initscript
 #
-#install -m755 %{SOURCE1} $RPM_BUILD_ROOT%{initdir}/atalk
+#install -m755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/atalk
 #cp include/atalk/*.h $RPM_BUILD_ROOT/usr/include/atalk/
 #cp sys/netatalk/*.h $RPM_BUILD_ROOT/usr/include/netatalk/
 chmod a-x bin/afile/acleandir.rc
@@ -133,6 +136,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %post
 /sbin/chkconfig --add atalk
+/sbin/ldconfig
 
 %preun
 if [ "$1" = "0" ] ; then
@@ -144,6 +148,7 @@ fi
 if [ "$1" -ge "1" ]; then
   /sbin/service atalk condrestart > /dev/null 2>&1 || :
 fi
+/sbin/ldconfig
 
 %files
 %defattr(-,root,root)
@@ -152,7 +157,7 @@ fi
 %doc bin/afile/acleandir.rc
 %doc config.example
 %dir /etc/atalk
-%attr(755,root,root) %config %{initdir}/atalk
+%attr(755,root,root) %config %{_initrddir}/atalk
 %config(noreplace) /etc/atalk/AppleVolumes.default
 %config(noreplace) /etc/atalk/AppleVolumes.system
 %config(noreplace) /etc/atalk/netatalk.conf
@@ -177,8 +182,13 @@ fi
 %{_datadir}/aclocal/netatalk.m4
 %{_libdir}/atalk/*.a
 %{_libdir}/atalk/*.la
-
+%{_bindir}/netatalk-config
 %changelog
+* Tue Apr 17 2007 Maros Barabas <mbarabas@redhat.com> - 4:2.0.3-10
+- fix merge review
+- fix nonstandard line endings
+- Resolves: #226190
+
 * Tue Jan 23 2007 Jindrich Novy <jnovy@redhat.com> - 4:2.0.3-9
 - rebuild against new db4
 
@@ -304,7 +314,7 @@ fi
 
 * Thu Jan 04 2001 Than Ngo <than@redhat.com>
 - fixed uams-path
-- added noreplace to %config
+- added noreplace to %%config
 
 * Mon Nov 20 2000 Tim Powers <timp@redhat.com>
 - rebuilt to fix bad dir perms
@@ -372,7 +382,7 @@ fi
 - gzip man pages
 - fixed netatalk-asun.librpcsvc.patch, -lnss_nis too
 - changed group
-- added %defattr to %files section
+- added %%defattr to %%files section
 
 * Tue Aug 3 1999 iNOUE Koich! <inoue@ma.ns.musashi-tech.ac.jp>
 - rpm-3.0 needs to remove vogus files from source.
@@ -413,7 +423,7 @@ fi
 * Mon Nov 16 1998 INOUE Koichi <inoue@ma.ns.musashi-tech.ac.jp>
 - Fix rcX.d's symbolic links.
 * Wed Oct 28 1998 INOUE Koichi <inoue@ma.ns.musashi-tech.ac.jp>
-- Use pre-asun2.1.0a-2 source. Remove '%exclusiveos linux' line.
+- Use pre-asun2.1.0a-2 source. Remove '%%exclusiveos linux' line.
 * Sat Oct 24 1998 INOUE Koichi <inoue@ma.ns.musashi-tech.ac.jp>
 - Use stable version source netatalk-1.4b2+asun2.1.0.tar.gz.
 * Mon Oct 5 1998 INOUE Koichi <inoue@ma.ns.musashi-tech.ac.jp>