diff --git a/.cvsignore b/.cvsignore
index 9bef470..69aca69 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-grep-2.4.2.tar.gz
+grep-2.5f.tar.bz2
diff --git a/grep.spec b/grep.spec
index 49455cf..25d342e 100644
--- a/grep.spec
+++ b/grep.spec
@@ -1,14 +1,21 @@
+%define beta f
+%define rel 2
 Summary: The GNU versions of grep pattern matching utilities.
 Name: grep
-Version: 2.4.2
-Release: 7
+Version: 2.5
+%if "%{beta}" != ""
+Release: 0.%{beta}.%{rel}
+%else
+Release: %{rel}
+%endif
 License: GPL
 Group: Applications/Text
-Source: ftp://ftp.gnu.org/pub/gnu/grep/grep-%{version}.tar.gz
-Patch: grep-2.4.2-i18n.patch
+Source: ftp://ftp.gnu.org/pub/gnu/grep/grep-%{version}%{beta}.tar.bz2
 Prefix: %{_prefix}
 Prereq: /sbin/install-info
 Buildroot: %{_tmppath}/%{name}-%{version}-root
+Requires: pcre
+Buildrequires: pcre-devel autoconf >= 2.52
 
 %description
 The GNU versions of commonly used grep utilities.  Grep searches
@@ -20,11 +27,11 @@ You should install grep on your system, because it is a very useful
 utility for searching through text.
 
 %prep
-%setup -q
-%patch -p1 -b .i18n
+%setup -q -n %{name}-%{version}%{beta}
 
 %build
-%configure --without-included-regex
+[ ! -e configure ] && ./autogen.sh
+%configure --prefix=/usr --without-included-regex
 make
 
 %install
@@ -63,11 +70,32 @@ fi
 %{_mandir}/*/*
 
 %changelog
-* Tue Jul 17 2001 Bernhard Rosenkraenzer <bero@redhat.com> 2.4.2-7
+* Wed Sep 26 2001 Bernhard Rosenkraenzer <bero@redhat.com> 2.5-0.f.2
+- Fix up echo A |grep '[A-Z0-9]' in locales other than C
+
+* Tue Sep 25 2001 Bernhard Rosenkraenzer <bero@redhat.com> 2.5-0.f.1
+- 2.5f, fixes #53603
+
+* Wed Jul 18 2001 Bernhard Rosenkraenzer <bero@redhat.com> 2.4.2-7
 - Fix up the i18n patch - it used to break "grep '[]a]'" (#49003)
+- revert to 2.4.2 (latest official release) for now
+
+* Mon May 28 2001 Bernhard Rosenkraenzer <bero@redhat.com> 2.5e-4
+- Fix "echo Linux forever |grep -D skip Linux"
+
+* Mon May 21 2001 Bernhard Rosenkraenzer <bero@redhat.com> 2.5e-3
+- Add new -D, --devices option
+- Fix a bug with "directories" being uninitialized
+
+* Sun May 13 2001 Bernhard Rosenkraenzer <bero@redhat.com> 2.5e-2
+- Fix up the --color option to behave like the one from ls (--color=auto)
+  Sooner or later, some people will alias grep="grep --color" and wonder why
+  their scripts break.
+- Update docs accordingly
+- Get rid of the annoying blinking in grep --color
 
-* Wed Jun 27 2001 Florian La Roche <Florian.LaRoche@redhat.de>
-- rebuild in new environment
+* Sun May 13 2001 Bernhard Rosenkraenzer <bero@redhat.com> 2.5e-1
+- 2.5e
 
 * Tue Feb 27 2001 Trond Eivind Glomsr�d <teg@redhat.com>
 - use %%{_tmppath}
diff --git a/sources b/sources
index 9a3972c..9cb351c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8ec9a2e875cd3aaa89896a8f39249f58  grep-2.4.2.tar.gz
+3c4870742412320a4f77d63828a34dd2  grep-2.5f.tar.bz2