diff --git a/patch-2.5.4-suffix.patch b/patch-2.5.4-suffix.patch
new file mode 100644
index 0000000..a8255e6
--- /dev/null
+++ b/patch-2.5.4-suffix.patch
@@ -0,0 +1,12 @@
+--- patch-2.5.4/patch.c.suffix	Thu Nov  2 17:57:46 2000
++++ patch-2.5.4/patch.c	Thu Nov  2 17:58:25 2000
+@@ -145,8 +145,7 @@
+ 		 : posixly_correct - 1);
+ 
+     val = getenv ("SIMPLE_BACKUP_SUFFIX");
+-    if (val && *val)
+-      simple_backup_suffix = val;
++    simple_backup_suffix = val && *val ? val : ".orig";
+ 
+     if ((version_control = getenv ("PATCH_VERSION_CONTROL")))
+       version_control_context = "$PATCH_VERSION_CONTROL";
diff --git a/patch.spec b/patch.spec
index fd3ac5a..bc7c69e 100644
--- a/patch.spec
+++ b/patch.spec
@@ -1,12 +1,13 @@
 Summary: The GNU patch command, for modifying/upgrading files.
 Name: patch
 Version: 2.5.4
-Release: 4
+Release: 9
 Copyright: GPL
 URL: http://www.gnu.org/software/patch/patch.html
 Group: Development/Tools
 Source: ftp://ftp.gnu.org/gnu/patch/patch-%{version}.tar.gz
 Patch1: patch-2.5-stderr.patch
+Patch2: patch-2.5.4-suffix.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 
 %description
@@ -22,10 +23,10 @@ applications.
 %prep
 %setup -q
 %patch1 -p1 -b .stderr
+%patch2 -p1 -b .suffix
 
 %build
-REAL_CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE"
-%define optflags \$REAL_CFLAGS
+CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE"
 %configure
 
 # XXX unset CPPFLAGS on (ultra?)sparc to avoid large file system support
@@ -49,6 +50,17 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/*/*
 
 %changelog
+* Fri Dec  1 2000 Tim Waugh <twaugh@redhat.com>
+- Rebuild because of fileutils bug.
+
+* Thu Nov  2 2000 Tim Waugh <twaugh@redhat.com>
+- use .orig as default suffix, as per man page and previous behaviour
+  (bug #20202).
+- use better patch for this, from maintainer.
+
+* Wed Oct  4 2000 Tim Waugh <twaugh@redhat.com>
+- actually use the RPM_OPT_FLAGS
+
 * Wed Jul 12 2000 Prospector <bugzilla@redhat.com>
 - automatic rebuild