diff --git a/automake.spec b/automake.spec
index 7e120ca..955fe19 100644
--- a/automake.spec
+++ b/automake.spec
@@ -1,9 +1,10 @@
 %define tarname automake-1.4-p5
+%define apiversion 1.4
 
 Summary: A GNU tool for automatically creating Makefiles.
 Name: automake
 Version: 1.4p5
-Release: 3
+Release: 4
 Copyright: GPL
 Group: Development/Tools
 Source: ftp://ftp.gnu.org/pub/gnu/automake/%{tarname}.tar.gz
@@ -12,6 +13,7 @@ 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
 Requires: perl
 Prereq: /sbin/install-info
@@ -36,11 +38,10 @@ GNU's Autoconf package.
 %patch2 -p1 -b .subdir
 %patch3 -p1 -b .backslash
 %patch4 -p1 -b .lisp
+%patch5 -p1 -b .version
 
 %build
-#./configure --prefix=%{_prefix}
-
-%configure
+%configure --program-suffix=-%{apiversion}
 make
 
 %install
@@ -51,6 +52,9 @@ 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
+
 %clean
 rm -rf ${RPM_BUILD_ROOT}
 
@@ -68,9 +72,13 @@ fi
 %{_bindir}/*
 %{_infodir}/*.info*
 %{_datadir}/automake
-%{_datadir}/aclocal
+%{_datadir}/aclocal-%{apiversion}
 
 %changelog
+* Thu Feb 28 2002 Jens Petersen <petersen@redhat.com> - 1.4p5-4
+- version bindir files and add symlinks to unversioned names
+- version aclocal
+
 * Wed Nov 14 2001 Jakub Jelinek <jakub@redhat.com> - 1.4p5-3
 - fix lisp.am bug