diff --git a/m4.spec b/m4.spec
index b86d165..e501f1d 100644
--- a/m4.spec
+++ b/m4.spec
@@ -1,14 +1,15 @@
 Summary: The GNU macro processor.
 Name: m4
 Version: 1.4.1
-Release: 5
+Release: 6
 Copyright: GPL
 Group: Applications/Text
 Source: ftp://ftp.gnu.org/gnu/m4/m4-1.4.1.tar.gz
-Patch: m4-1.4.1-sec.patch
-Buildroot: /var/tmp/m4-root
+URL: ftp://ftp.gnu.org/gnu/m4/
+Patch0: m4-1.4.1-sec.patch
+Patch1: m4-1.4.1-configure.patch
+Buildroot: %{_tmppath}/%{name}-root
 Prereq: /sbin/install-info
-Prefix: /usr
 
 %description
 A GNU implementation of the traditional UNIX macro processor.  M4 is
@@ -24,18 +25,20 @@ Install m4 if you need a macro processor.
 rm -rf $RPM_BUILD_ROOT
 
 %setup
-%patch -p1
+%patch0 -p1
+%patch1 -p1
 
 %build
-autoconf
+autoreconf -f
+test -f /usr/share/libtool/config.guess && cp /usr/share/libtool/config.guess .
+test -f /usr/share/libtool/config.sub   && cp /usr/share/libtool/config.sub .
 %configure
 make CFLAGS="$RPM_OPT_FLAGS" LDFLAGS=-s
 
 %install
 %makeinstall INSTALL_DATA="install -c -m644"
-strip -R .comment $RPM_BUILD_ROOT/usr/bin/m4
-[ -d $RPM_BUILD_ROOT/usr/info ] && mv $RPM_BUILD_ROOT/usr/info $RPM_BUILD_ROOT/usr/share
-gzip -9fn $RPM_BUILD_ROOT/usr/share/info/*
+#[ -d $RPM_BUILD_ROOT/usr/info ] && mv $RPM_BUILD_ROOT/usr/info $RPM_BUILD_ROOT/usr/share
+#gzip -9fn $RPM_BUILD_ROOT/usr/share/info/*
 
 %files
 %defattr(-,root,root)
@@ -55,6 +58,12 @@ fi
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Sat Jan 05 2002 Florian La Roche <Florian.LaRoche@redhat.de>
+- add URL tag
+- improved spec file
+- add hack to update config.guess config.sub
+- fix to build with newer autoconf versions
+
 * Sun Jun 24 2001 Elliot Lee <sopwith@redhat.com>
 - Bump release + rebuild.