diff --git a/automake.spec b/automake.spec
index 6f8b8b9..e7e19d0 100644
--- a/automake.spec
+++ b/automake.spec
@@ -1,17 +1,18 @@
 %define api_version 1.11
+# Kludge to remove bogus Automake perl dependencies and provides
+%global reqfilt /bin/sh -c "%{__perl_requires} | grep -Fv 'perl(Automake::'"
+%define __perl_requires %{reqfilt}
+%global provfilt /bin/sh -c "%{__perl_provides} | grep -Fv 'perl(Automake::'"
+%define __perl_provides %{provfilt}
 
 Summary:    A GNU tool for automatically creating Makefiles
 Name:       automake
 Version:    %{api_version}.1
-Release:    1%{?dist}
+Release:    2%{?dist}
 License:    GPLv2+ and GFDL
 Group:      Development/Tools
 Source:     http://ftp.gnu.org/gnu/automake/automake-%{version}.tar.bz2
-Source1:    filter-provides-automake.sh
-Source2:    filter-requires-automake.sh
-Source3:    automake.man
-Source4:    aclocal.man
-URL:        http://sources.redhat.com/automake
+URL:        http://sourceware.org/automake/
 Requires:   autoconf >= 2.62
 Buildrequires:  autoconf >= 2.62
 Requires(post): /sbin/install-info
@@ -24,10 +25,6 @@ BuildRequires: libtool gettext-devel flex bison texinfo-tex texlive-dvips
 BuildRequires: gcc-java java-devel-openjdk gcc-gfortran /usr/bin/g77
 BuildRequires: dejagnu expect emacs imake python-docutils vala
 
-%define _use_internal_dependency_generator 0
-%define __find_provides %{SOURCE1}
-%define __find_requires %{SOURCE2}
-
 %description
 Automake is a tool for automatically generating `Makefile.in'
 files compliant with the GNU Coding Standards.
@@ -38,7 +35,7 @@ Makefiles. If you install Automake, you will also need to install
 GNU's Autoconf package.
 
 %prep
-%setup -q
+%setup -q -n automake-%{version}
 
 %build
 ./configure --prefix=%{_prefix} --mandir=%{_mandir} --infodir=%{_infodir} \
@@ -51,14 +48,12 @@ iconv -f ISO_8859-15 -t UTF-8 NEWS_ -o NEWS
 %install
 rm -rf ${RPM_BUILD_ROOT}
 
-make install DESTDIR=$RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man1
-install -p -m 644 %{SOURCE3} $RPM_BUILD_ROOT/%{_mandir}/man1/automake.1
-install -p -m 644 %{SOURCE4} $RPM_BUILD_ROOT/%{_mandir}/man1/aclocal.1
+make install DESTDIR=${RPM_BUILD_ROOT}
+mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man1
 
 # create this dir empty so we can own it
 mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/aclocal
-rm -f $RPM_BUILD_ROOT%{_infodir}/dir
+rm -f ${RPM_BUILD_ROOT}%{_infodir}/dir
 
 %check
 make check
@@ -85,6 +80,12 @@ fi
 %dir %{_datadir}/aclocal
 
 %changelog
+* Tue Mar 02 2010 Karsten Hopp <karsten@redhat.com> 1.11.1-2
+- better method of fixing the perl requires/provides (Paul Howarth, #225302)
+- fix variable usage in spec file (#225302)
+- use pregenerated manpages from automake-1.11 (#225302)
+- update URL (#225302)
+
 * Wed Dec 09 2009 Karsten Hopp <karsten@redhat.com> 1.11.1-1
 - update to version 1.11.1 to fix CVE-2009-4029