diff --git a/grep.spec b/grep.spec
index 03b47ae..397125a 100644
--- a/grep.spec
+++ b/grep.spec
@@ -1,7 +1,7 @@
 Summary: The GNU versions of grep pattern matching utilities.
 Name: grep
 Version: 2.5.1
-Release: 29
+Release: 30
 License: GPL
 Group: Applications/Text
 Source: ftp://ftp.gnu.org/pub/gnu/grep/grep-%{version}.tar.bz2
@@ -11,11 +11,11 @@ Patch2: grep-2.5-i18n.patch
 Patch3: grep-2.5.1-oi.patch
 Patch4: grep-2.5.1-manpage.patch
 Patch5: grep-2.5.1-gofast.patch
-Prefix: %{_prefix}
+URL: http://www.gnu.org/software/grep/
 Prereq: /sbin/install-info
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 Requires: pcre
-Buildrequires: pcre-devel, texinfo, gettext
+Buildrequires: pcre-devel, texinfo, gettext, gzip
 
 %description
 The GNU versions of commonly used grep utilities.  Grep searches
@@ -27,7 +27,7 @@ You should install grep on your system, because it is a very useful
 utility for searching through text.
 
 %prep
-%setup -q -n %{name}-%{version}
+%setup -q
 %patch0 -p1 -b .fgrep
 %patch1 -p1 -b .bracket
 %patch2 -p1 -b .i18n
@@ -37,16 +37,16 @@ utility for searching through text.
 
 %build
 [ ! -e configure ] && ./autogen.sh
-%configure --prefix=/usr --without-included-regex
-make CFLAGS="$RPM_OPT_FLAGS -I/usr/include/pcre"
+%configure --without-included-regex
+make CFLAGS="$RPM_OPT_FLAGS -I%{_includedir}/pcre"
 
 %install
 rm -rf ${RPM_BUILD_ROOT}
 %makeinstall LDFLAGS=-s prefix=${RPM_BUILD_ROOT}%{_prefix} exec_prefix=${RPM_BUILD_ROOT}
 %ifos Linux
 mkdir -p $RPM_BUILD_ROOT/bin
-mv $RPM_BUILD_ROOT%{_prefix}/bin/* $RPM_BUILD_ROOT/bin
-rm -rf $RPM_BUILD_ROOT%{_prefix}/bin
+mv -f $RPM_BUILD_ROOT%{_bindir}/* $RPM_BUILD_ROOT/bin
+rm -rf $RPM_BUILD_ROOT%{_bindir}
 %endif
 gzip -9f $RPM_BUILD_ROOT%{_infodir}/grep*
 rm -f $RPM_BUILD_ROOT%{_infodir}/dir
@@ -75,12 +75,16 @@ fi
 %ifos Linux
 /bin/*
 %else
-%{_prefix}/bin/*
+%{_bindir}/*
 %endif
 %{_infodir}/*.info*.gz
 %{_mandir}/*/*
 
 %changelog
+* Mon Oct 11 2004 Tim Waugh <twaugh@redhat.com> 2.5.1-30
+- Applied patch from Robert Scheck to tidy spec file and add a URL
+  tag (bug #135185).
+
 * Tue Jun 15 2004 Elliot Lee <sopwith@redhat.com>
 - rebuilt