diff --git a/.cvsignore b/.cvsignore
index e69de29..9697754 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -0,0 +1 @@
+patch-2.5.4.tar.gz
diff --git a/patch-2.5-stderr.patch b/patch-2.5-stderr.patch
new file mode 100644
index 0000000..d7a461c
--- /dev/null
+++ b/patch-2.5-stderr.patch
@@ -0,0 +1,11 @@
+--- patch-2.5/util.c~	Thu Jul 10 09:16:12 1997
++++ patch-2.5/util.c	Sun Jun  6 18:16:30 1999
+@@ -568,6 +568,8 @@
+   int r;
+   va_list args;
+ 
++  fflush(stderr);	/* Ensure pending errors are written before the question */
++
+   vararg_start (args, format);
+   vfprintf (stdout, format, args);
+   va_end (args);
diff --git a/patch.spec b/patch.spec
new file mode 100644
index 0000000..fd3ac5a
--- /dev/null
+++ b/patch.spec
@@ -0,0 +1,100 @@
+Summary: The GNU patch command, for modifying/upgrading files.
+Name: patch
+Version: 2.5.4
+Release: 4
+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
+Buildroot: %{_tmppath}/%{name}-%{version}-root
+
+%description
+The patch program applies diff files to originals.  The diff command
+is used to compare an original to a changed file.  Diff lists the
+changes made to the file.  A person who has the original file can then
+use the patch command with the diff file to add the changes to their
+original file (patching the file).
+
+Patch should be installed because it is a common way of upgrading
+applications.
+
+%prep
+%setup -q
+%patch1 -p1 -b .stderr
+
+%build
+REAL_CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE"
+%define optflags \$REAL_CFLAGS
+%configure
+
+# XXX unset CPPFLAGS on (ultra?)sparc to avoid large file system support
+%ifarch sparc sparc64
+make CPPFLAGS=""
+%else
+make
+%endif
+
+%install
+rm -rf $RPM_BUILD_ROOT
+%makeinstall
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr(-,root,root)
+%doc NEWS README
+/usr/bin/*
+%{_mandir}/*/*
+
+%changelog
+* Wed Jul 12 2000 Prospector <bugzilla@redhat.com>
+- automatic rebuild
+
+* 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>
+- added URL
+
+* Wed Feb 16 2000 Bernhard Rosenkraenzer <bero@redhat.com>
+- 2.5.4
+- Fix up LFS support on Alpha (Bug #5732)
+
+* Mon Feb  7 2000 Bill Nottingham <notting@redhat.com>
+- handle compressed manpages
+
+* Sun Jun 06 1999 Alan Cox <alan@redhat.com>
+- Fix the case where stderr isnt flushed for ask(). Now the 'no such file'
+  appears before the skip patch question, not at the very end, Doh!
+
+* Mon Mar 22 1999 Jeff Johnson <jbj@redhat.com>
+- (ultra?) sparc was getting large file system support.
+
+* Sun Mar 21 1999 Cristian Gafton <gafton@redhat.com> 
+- auto rebuild in the new build environment (release 7)
+
+* Fri Dec 18 1998 Cristian Gafton <gafton@redhat.com>
+- build against glibc 2.1
+
+* Tue Sep  1 1998 Jeff Johnson <jbj@redhat.com>
+- bump release to preserve newer than back-ported 4.2.
+
+* Tue Jun 09 1998 Prospector System <bugs@redhat.com>
+- translations modified for de, fr
+
+* Tue Jun  9 1998 Jeff Johnson <jbj@redhat.com>
+- Fix for problem #682 segfault.
+
+* Fri Apr 24 1998 Prospector System <bugs@redhat.com>
+- translations modified for de, fr, tr
+
+* Tue Apr 07 1998 Cristian Gafton <gafton@redhat.com>
+- added buildroot
+
+* Wed Oct 21 1997 Cristian Gafton <gafton@redhat.com>
+- updated to 2.5
+
+* Mon Jun 02 1997 Erik Troan <ewt@redhat.com>
+- built against glibc
diff --git a/sources b/sources
index e69de29..2520be1 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+ee5ae84d115f051d87fcaaef3b4ae782  patch-2.5.4.tar.gz