diff --git a/.cvsignore b/.cvsignore
index 69aca69..bc8482f 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-grep-2.5f.tar.bz2
+grep-2.5.tar.bz2
diff --git a/grep.spec b/grep.spec
index 25d342e..dbed7f4 100644
--- a/grep.spec
+++ b/grep.spec
@@ -1,5 +1,5 @@
-%define beta f
-%define rel 2
+%define beta %nil
+%define rel 1
 Summary: The GNU versions of grep pattern matching utilities.
 Name: grep
 Version: 2.5
@@ -15,7 +15,7 @@ Prefix: %{_prefix}
 Prereq: /sbin/install-info
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 Requires: pcre
-Buildrequires: pcre-devel autoconf >= 2.52
+Buildrequires: pcre-devel
 
 %description
 The GNU versions of commonly used grep utilities.  Grep searches
@@ -50,11 +50,11 @@ gzip -9f $RPM_BUILD_ROOT%{_infodir}/grep*
 rm -rf ${RPM_BUILD_ROOT}
 
 %post
-/sbin/install-info --quiet --info-dir=%{_infodir} %{_infodir}/grep.info.gz
+[ -e %{_infodir}/grep.info.gz ] && /sbin/install-info --quiet --info-dir=%{_infodir} %{_infodir}/grep.info.gz || :
 
 %preun
 if [ $1 = 0 ]; then
-	/sbin/install-info --quiet --info-dir=%{_infodir} --delete %{_infodir}/grep.info.gz
+	[ -e %{_infodir}/grep.info.gz ] && /sbin/install-info --quiet --info-dir=%{_infodir} --delete %{_infodir}/grep.info.gz
 fi
 
 %files -f %{name}.lang
@@ -70,6 +70,21 @@ fi
 %{_mandir}/*/*
 
 %changelog
+* Wed Mar 13 2002 Bernhard Rosenkraenzer <bero@redhat.com> 2.5-1
+- 2.5 final
+
+* Wed Jan 23 2002 Bernhard Rosenkraenzer <bero@redhat.com> 2.5-0.g.1
+- 2.5g
+
+* Wed Jan 09 2002 Tim Powers <timp@redhat.com>
+- automated rebuild
+
+* Mon Nov 19 2001 Bernhard Rosenkraenzer <bero@redhat.com> 2.5-0.f.4
+- Update CVS to reduce bloat
+
+* Thu Nov  8 2001 Bernhard Rosenkraenzer <bero@redhat.com> 2.5-0.f.3
+- Don't fail %%post with --excludedocs
+
 * 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
 
diff --git a/sources b/sources
index 9cb351c..f772927 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3c4870742412320a4f77d63828a34dd2  grep-2.5f.tar.bz2
+5e7bd36e089b637ab3795354ec25dcae  grep-2.5.tar.bz2