diff --git a/patch.spec b/patch.spec
index cb82bdd..9be7756 100644
--- a/patch.spec
+++ b/patch.spec
@@ -1,7 +1,7 @@
 Summary: The GNU patch command, for modifying/upgrading files
 Name: patch
 Version: 2.5.4
-Release: 30%{?dist}
+Release: 31%{?dist}
 License: GPLv2+
 URL: http://www.gnu.org/software/patch/patch.html
 Group: Development/Tools
@@ -45,7 +45,7 @@ CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE"
 %ifarch sparc sparc64
 make CPPFLAGS=""
 %else
-make
+make %{?smp_mflags}
 %endif
 
 %install
@@ -56,12 +56,18 @@ rm -rf $RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc NEWS README
-/usr/bin/*
+%{_bindir}/*
 %{_mandir}/*/*
 
 %changelog
+* Mon Dec  3 2007 Tim Waugh <twaugh@redhat.com> 2.5.4-31
+- Convert spec file to UTF-8 (bug #226233).
+- Use _bindir macro in %%files (bug #226233).
+- Parallel make (bug #226233).
+- Better defattr declaration (bug #226233).
+
 * Thu Oct  4 2007 Tim Waugh <twaugh@redhat.com>
 - Beginnings of an SELinux patch (bug #165799); not applied yet.
 
@@ -157,10 +163,10 @@ rm -rf $RPM_BUILD_ROOT
 * Wed Jul 12 2000 Prospector <bugzilla@redhat.com>
 - automatic rebuild
 
-* Tue Jun 13 2000 Trond Eivind Glomsrød <teg@redhat.com>
+* Tue Jun 13 2000 Trond Eivind Glomsrød <teg@redhat.com>
 - Use %%makeinstall, %%{_tmppath} and %%{_mandir}
 
-* Fri May 12 2000 Trond Eivind Glomsrød <teg@redhat.com>
+* Fri May 12 2000 Trond Eivind Glomsrød <teg@redhat.com>
 - added URL
 
 * Wed Feb 16 2000 Bernhard Rosenkraenzer <bero@redhat.com>