diff --git a/.cvsignore b/.cvsignore
index 544fd8d..2b24765 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-automake-1.4-p5.tar.gz
+automake-1.6.2.tar.bz2
diff --git a/automake.spec b/automake.spec
index 955fe19..76b587a 100644
--- a/automake.spec
+++ b/automake.spec
@@ -1,24 +1,19 @@
-%define tarname automake-1.4-p5
-%define apiversion 1.4
+%define api_version 1.6
 
 Summary: A GNU tool for automatically creating Makefiles.
 Name: automake
-Version: 1.4p5
-Release: 4
-Copyright: GPL
+Version: 1.6.2
+Release: 2
+License: GPL
 Group: Development/Tools
-Source: ftp://ftp.gnu.org/pub/gnu/automake/%{tarname}.tar.gz
-Patch0: automake-1.4-19980208.patch
-Patch1: automake-1.4-libtoolize.patch
-Patch2: automake-1.4-subdir.patch
-Patch3: automake-1.4-backslash.patch
-Patch4: automake-1.4-lisp.patch
-Patch5: automake-1.4-versioning.patch
-URL: http://sourceware.cygnus.com/automake
+Source: ftp://ftp.gnu.org/gnu/automake/automake-%{version}.tar.bz2
+Patch1: automake-1.6-warn.patch
+URL: http://sources.redhat.com/automake
 Requires: perl
+Buildrequires: autoconf >= 2.52
 Prereq: /sbin/install-info
 BuildArchitectures: noarch
-Buildroot: %{_tmppath}/%{name}-root
+Buildroot: %{_tmppath}/%{name}-%{version}-root
 
 %description
 Automake is an experimental Makefile generator. Automake was inspired
@@ -31,18 +26,13 @@ Makefiles. If you install Automake, you will also need to install
 GNU's Autoconf package.
 
 %prep
-%setup -q -n %{tarname}
-# XXX don't apply development patch from CVS.
-#%patch0 -p0 -b .19980208
-%patch1 -p0
-%patch2 -p1 -b .subdir
-%patch3 -p1 -b .backslash
-%patch4 -p1 -b .lisp
-%patch5 -p1 -b .version
+%setup -q -n automake-%{version}
+# %patch1 -p1 -b .warn
 
 %build
-%configure --program-suffix=-%{apiversion}
+%configure
 make
+make check 
 
 %install
 rm -rf ${RPM_BUILD_ROOT}
@@ -52,8 +42,8 @@ rm -rf ${RPM_BUILD_ROOT}
 
 gzip -9nf ${RPM_BUILD_ROOT}%{_infodir}/automake*
 
-ln -s automake-%{apiversion} ${RPM_BUILD_ROOT}%{_bindir}/automake
-ln -s aclocal-%{apiversion} ${RPM_BUILD_ROOT}%{_bindir}/aclocal
+# create this dir empty so we can own it
+mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/aclocal
 
 %clean
 rm -rf ${RPM_BUILD_ROOT}
@@ -71,16 +61,55 @@ fi
 %doc AUTHORS COPYING ChangeLog INSTALL NEWS README THANKS TODO
 %{_bindir}/*
 %{_infodir}/*.info*
-%{_datadir}/automake
-%{_datadir}/aclocal-%{apiversion}
+%{_datadir}/automake-%{api_version}
+%{_datadir}/aclocal-%{api_version}
+%dir %{_datadir}/aclocal
 
 %changelog
-* Thu Feb 28 2002 Jens Petersen <petersen@redhat.com> - 1.4p5-4
-- version bindir files and add symlinks to unversioned names
-- version aclocal
+* Thu Jul 11 2002 Jens Petersen <petersen@redhat.com> 1.6.2-2
+- add buildrequires autoconf 2.52 or greater (reported by Edward Avis) 
 
-* Wed Nov 14 2001 Jakub Jelinek <jakub@redhat.com> - 1.4p5-3
-- fix lisp.am bug
+* Wed Jun 19 2002 Jens Petersen <petersen@redhat.com> 1.6.2-1
+- 1.6.2 (bug fix release)
+- do "make check" after building
+
+* Thu May 23 2002 Tim Powers <timp@redhat.com> 1.6.1-2
+- automated rebuild
+
+* Tue Apr 23 2002 Jens Petersen <petersen@redhat.com> 1.6.1-1
+- 1.6.1
+
+* Tue Mar 12 2002 Jens Petersen <petersen@redhat.com> 1.6-1
+- new package based on automake15
+- 1.6
+
+* Wed Jan 23 2002 Jens Petersen <petersen@redhat.com> 1.5-8
+- better aclocal versioning
+
+* Wed Jan 23 2002 Jens Petersen <petersen@redhat.com> 1.5-7
+- don't version datadir/automake
+
+* Tue Jan 15 2002 Jens Petersen <petersen@redhat.com> 1.5-6
+- version suffix programs and data directories
+- own symlinks to programs and /usr/share/aclocal
+
+* Wed Jan 09 2002 Tim Powers <timp@redhat.com> 1.5-5
+- automated rebuild
+
+* Wed Jan  9 2002 Bernhard Rosenkraenzer <bero@redhat.com> 1.5-4
+- Completely back out the fix for #56624 for now, it causes more problems
+  than it fixes in either form.
+
+* Wed Jan  9 2002 Bernhard Rosenkraenzer <bero@redhat.com> 1.5-3
+- Don't use AS_DIRNAME, it doesn't work.
+
+* Tue Jan  7 2002 Jens Petersen <petersen@redhat.com> 1.5-2
+- Patch depout.m4 to handle makefiles passed to make with "-f" (#56624)
+
+* Tue Sep 18 2001 Bernhard Rosenkraenzer <bero@redhat.com> 1.5-1
+- Update to 1.5 - much better to coexist with autoconf 2.52...
+- Fix specfile
+- No patches
 
 * Fri Aug 24 2001 Jens Petersen <petersen@redhat.com> - 1.4p5-2
 - dont raise error when there is source in a subdirectory (bug #35156).
diff --git a/sources b/sources
index 39a9803..134670a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e10679bba411f8602eed004012d915e3  automake-1.4-p5.tar.gz
+74e203a6b1d90789bba4ae0415a02930  automake-1.6.2.tar.bz2