diff --git a/.cvsignore b/.cvsignore
index 94e43f7..4b192cb 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-automake-1.4.tar.gz
+automake-1.4-p4.tar.gz
diff --git a/automake.spec b/automake.spec
index b3e8709..c6a634e 100644
--- a/automake.spec
+++ b/automake.spec
@@ -1,13 +1,14 @@
+%define tarname automake-1.4-p4
+
 Summary: A GNU tool for automatically creating Makefiles.
 Name: automake
-Version: 1.4
-Release: 8
+Version: 1.4p4
+Release: 2
 Copyright: GPL
 Group: Development/Tools
-Source: ftp://ftp.cygnus.com/pub/home/tromey/automake-%{version}.tar.gz
+Source: ftp://ftp.gnu.org/pub/gnu/automake/%{tarname}.tar.gz
 Patch0: automake-1.4-19980208.patch
-Patch1: automake-1.4-armnetwinder.patch
-Patch2: automake-1.4-copytosourcedir.patch
+Patch1: automake-1.4-libtoolize.patch
 URL: http://sourceware.cygnus.com/automake
 Requires: perl
 Prereq: /sbin/install-info
@@ -25,11 +26,10 @@ standard Makefiles. if you install Automake, you will also need to
 install GNU's Autoconf package.
 
 %prep
-%setup -q
+%setup -q -n %{tarname}
 # XXX don't apply development patch from CVS.
 #%patch0 -p0 -b .19980208
-%patch1 -p1 -b .armnetwinder
-%patch2 -p0 -b .copytosourcedir
+%patch1 -p0
 
 %build
 #./configure --prefix=%{_prefix}
@@ -65,6 +65,16 @@ fi
 %{_datadir}/aclocal
 
 %changelog
+* Tue Jun 12 2001 Florian La Roche <Florian.LaRoche@redhat.de>
+- add the patch from #20559
+- really update to 1.4-p4
+
+* Mon Jun 11 2001 Florian La Roche <Florian.LaRoche@redhat.de>
+- update to 1.4-p4
+
+* Sat May 12 2001 Owen Taylor <otaylor@redhat.com>
+- Version 1.4-p1 to work with libtool-1.4
+
 * Wed Jul 12 2000 Prospector <bugzilla@redhat.com>
 - automatic rebuild
 
diff --git a/sources b/sources
index 7a9da32..d88efb9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1d483ffa4349bfc9ab8ae0de0c617c7b  automake-1.4.tar.gz
+a5ef994fcc0359af3db8ebb0b6f5fafb  automake-1.4-p4.tar.gz