diff --git a/pnm2ppa.spec b/pnm2ppa.spec
index 3583283..68c2e90 100644
--- a/pnm2ppa.spec
+++ b/pnm2ppa.spec
@@ -2,9 +2,10 @@ Name: pnm2ppa
 Summary: Drivers for printing to HP PPA printers
 Epoch: 1
 Version: 1.04
-Release: 19%{?dist}
+Release: 20%{?dist}
 URL: http://sourceforge.net/projects/pnm2ppa 
 Source: http://download.sourceforge.net/pnm2ppa/pnm2ppa-%{version}.tar.gz
+# Following sourcelink is dead currently.
 Source1: http://www.httptech.com/ppa/files/ppa-0.8.6.tar.gz
 # Upstream sync.
 Patch2: pbm2ppa-20000205.diff
@@ -12,8 +13,6 @@ Patch2: pbm2ppa-20000205.diff
 Patch3: pnm2ppa-redhat.patch
 License: GPLv2
 Group: Applications/Publishing
-Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-%define topdir pnm2ppa-%{version}
 
 %description
 Pnm2ppa is a color driver for HP PPA host-based printers such as the
@@ -24,44 +23,48 @@ printer in PPA format.
 Install pnm2ppa if you need to print to a PPA printer.
 
 %prep
-%setup -q -n %{topdir}
+%setup -q
 
 #pbm2ppa source
-%setup -q -T -D -a 1 -n %{topdir}
+%setup -q -T -D -a 1 
 %patch2 -p0 -b .20000205
 %patch3 -p1 -b .rh
 
+for file in docs/en/LICENSE pbm2ppa-0.8.6/LICENSE; do
+ sed "s|\r||g" $file > $file.new && \
+ touch -r $file $file.new && \
+ mv $file.new $file
+done
+
 %build
-make 
-cd pbm2ppa-0.8.6
-make
+make %{?_smp_mflags}
+pushd pbm2ppa-0.8.6
+make %{?_smp_mflags}
+popd
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_bindir}
 install -d $RPM_BUILD_ROOT%{_sysconfdir}
 install -d $RPM_BUILD_ROOT%{_mandir}/man1
 make INSTALLDIR=$RPM_BUILD_ROOT%{_bindir} CONFDIR=$RPM_BUILD_ROOT%{_sysconfdir} \
     MANDIR=$RPM_BUILD_ROOT%{_mandir}/man1 install 
-install -m 0755 utils/Linux/detect_ppa $RPM_BUILD_ROOT%{_bindir}
-install -m 0755 utils/Linux/test_ppa $RPM_BUILD_ROOT%{_bindir}
-install -m 0755 pbm2ppa-0.8.6/pbm2ppa  $RPM_BUILD_ROOT%{_bindir}
-install -m 0755 pbm2ppa-0.8.6/pbmtpg   $RPM_BUILD_ROOT%{_bindir}
-install -m 0644 pbm2ppa-0.8.6/pbm2ppa.conf $RPM_BUILD_ROOT%{_sysconfdir}
-install -m 0644 pbm2ppa-0.8.6/pbm2ppa.1   $RPM_BUILD_ROOT%{_mandir}/man1
+install -p -m 0755 utils/Linux/detect_ppa $RPM_BUILD_ROOT%{_bindir}
+install -p -m 0755 utils/Linux/test_ppa $RPM_BUILD_ROOT%{_bindir}
+install -p -m 0755 pbm2ppa-0.8.6/pbm2ppa  $RPM_BUILD_ROOT%{_bindir}
+install -p -m 0755 pbm2ppa-0.8.6/pbmtpg   $RPM_BUILD_ROOT%{_bindir}
+install -p -m 0644 pbm2ppa-0.8.6/pbm2ppa.conf $RPM_BUILD_ROOT%{_sysconfdir}
+install -p -m 0644 pbm2ppa-0.8.6/pbm2ppa.1   $RPM_BUILD_ROOT%{_mandir}/man1
 
 chmod 644 docs/en/LICENSE
 mkdir -p pbm2ppa
 for file in CALIBRATION CREDITS INSTALL INSTALL-MORE LICENSE README ; do
-  install -m 0644 pbm2ppa-0.8.6/$file pbm2ppa/$file
+  install -p -m 0644 pbm2ppa-0.8.6/$file pbm2ppa/$file
 done
 
-%clean
-rm -rf $RPM_BUILD_ROOT 
 
 %files 
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc docs/en/CREDITS docs/en/INSTALL docs/en/LICENSE docs/en/README
 %doc docs/en/RELEASE-NOTES docs/en/TODO
 %doc docs/en/INSTALL.REDHAT.txt docs/en/COLOR.txt docs/en/CALIBRATION.txt
@@ -80,6 +83,9 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace) %{_sysconfdir}/pbm2ppa.conf
 
 %changelog
+* Tue Oct 05 2010 Parag Nemade <paragn AT fedoraproject.org> - 1:1.04-20
+- Merge-review cleanup (#226303)
+
 * Fri Mar  5 2010 Tim Waugh <twaugh@redhat.com> - 1:1.04-19
 - Consistent use of macros.
 - Removed ancient obsoletes tag.