diff --git a/setserial-2.17-fhs.patch b/setserial-2.17-fhs.patch
index c6ef2d3..fa4d62b 100644
--- a/setserial-2.17-fhs.patch
+++ b/setserial-2.17-fhs.patch
@@ -5,11 +5,11 @@
  srcdir = @srcdir@
  VPATH = @srcdir@
 +bindir = @bindir@
-+mandir = @bindir@
++mandir = @mandir@
  
  VERSION = @RELEASE_VERSION@
  INSTALL = @INSTALL@
-@@ -26,9 +28,9 @@
+@@ -26,9 +28,8 @@
  	nroff -man setserial.8 > setserial.cat
  
  install: setserial setserial.8
@@ -17,7 +17,6 @@
 -	$(STRIP) $(DESTDIR)/bin/setserial
 -	$(INSTALL_DATA) setserial.8 $(DESTDIR)/usr/man/man8
 +	$(INSTALL_PROGRAM) setserial $(DESTDIR)$(bindir)
-+	$(STRIP) $(DESTDIR)$(bindir)/setserial
 +	$(INSTALL_DATA) setserial.8 $(DESTDIR)$(mandir)/man8
  
  clean:
diff --git a/setserial-2.17-readme.patch b/setserial-2.17-readme.patch
index 1ca8f99..28d4571 100644
--- a/setserial-2.17-readme.patch
+++ b/setserial-2.17-readme.patch
@@ -6,6 +6,6 @@
  rc.serial file to the appropriate /etc/rc.d directory.  For example,
 -to install rc.serial on a RedHat system, copy rc.serial to 
 -/etc/rc.d/init.d/serial, and then run the command "chkconfig -add serial".
-+to install rc.serial on a Red Hat Linux system, copy rc.serial to 
++to install rc.serial on a Fedora system, copy rc.serial to 
 +/etc/rc.d/init.d/serial, and then run the command "chkconfig --add serial".
  
diff --git a/setserial.spec b/setserial.spec
index c4fe74b..ef3fcf0 100644
--- a/setserial.spec
+++ b/setserial.spec
@@ -1,9 +1,9 @@
 %define	_bindir	/bin
 
-Summary: A utility for configuring serial ports.
+Summary: A utility for configuring serial ports
 Name: setserial
 Version: 2.17
-Release: 19.2.2
+Release: 20%{?dist}
 Source: http://dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.gz
 Patch0: setserial-2.17-fhs.patch
 Patch1: setserial-2.17-rc.patch
@@ -12,7 +12,7 @@ Patch3: setserial-2.17-spelling.patch
 License: GPL
 Group: Applications/System
 URL: http://setserial.sourceforge.net/
-BuildRoot: %{_tmppath}/%{name}-root
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 ExcludeArch: s390 s390x
 
 BuildRequires: groff
@@ -31,27 +31,34 @@ port and IRQ that a particular serial device is using, and more.
 rm -f config.cache
 
 %build
-
 %configure
-make
+make %{?_smp_mflags}
 
 %install
 rm -rf ${RPM_BUILD_ROOT}
-mkdir -p ${RPM_BUILD_ROOT}%{_bindir}
-mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man8
-
-%makeinstall STRIP=:
+mkdir -p ${RPM_BUILD_ROOT}/%{_bindir}
+mkdir -p ${RPM_BUILD_ROOT}/%{_mandir}/man8
+make install DESTDIR=${RPM_BUILD_ROOT}
 
 %clean
 rm -rf ${RPM_BUILD_ROOT}
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc README rc.serial
 %{_bindir}/setserial
 %{_mandir}/man*/*
 
 %changelog
+* Wed Feb  7 2007 Tim Waugh <twaugh@redhat.com> 2.17-20
+- Fixed mandir in fhs patch (bug #226411).
+- Don't run strip (bug #226411).
+- Fixed readme patch to talk about Fedora not Red Hat Linux (bug #226411).
+- Fixed build root tag (bug #226411).
+- Use SMP make flags (bug #226411).
+- Avoid %%makeinstall (bug #226411).
+- Fixed summary (bug #226411).
+
 * Wed Jul 12 2006 Jesse Keating <jkeating@redhat.com> - 2.17-19.2.2
 - rebuild
 
@@ -148,7 +155,7 @@ rm -rf ${RPM_BUILD_ROOT}
   all that sunsite has) - not sure what the difference is.
 
 * Thu Sep 25 1997 Christian 'Dr. Disk' Hechelmann <drdisk@ds9.au.s.shuttle.de>
-- added %attr's
+- added %%attr's
 - added sanity check for RPM_BUILD_ROOT
 - setserial is now installed into /bin, where util-linux puts it and all
   startup scripts expect it.