diff --git a/autoconf.spec b/autoconf.spec
index 20d16b2..923f8b7 100644
--- a/autoconf.spec
+++ b/autoconf.spec
@@ -1,10 +1,12 @@
 Summary:    A GNU tool for automatically configuring source code
 Name:       autoconf
 Version:    2.61
-Release:    4%{?dist}
+Release:    5%{?dist}
 License:    GPL
 Group:      Development/Tools
 Source:     http://ftp.gnu.org/gnu/autoconf/autoconf-%{version}.tar.bz2
+Source1:    filter-provides-automake.sh
+Source2:    filter-requires-automake.sh
 URL:        http://www.gnu.org/software/autoconf/
 BuildRequires:      sed, m4, emacs, gawk
 Requires(post):     /sbin/install-info
@@ -13,6 +15,10 @@ Requires:           gawk, m4, mktemp, imake
 BuildArch: noarch
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+%define _use_internal_dependency_generator 0
+%define __find_provides %{SOURCE1}
+%define __find_requires %{SOURCE2}
+
 %description
 GNU's Autoconf is a tool for configuring source code and Makefiles.
 Using Autoconf, programmers can create portable and configurable
@@ -33,13 +39,8 @@ their use.
 %setup -q
 
 %build
-# move config files out of they way as they require help2man from extras:
-cp -p build-aux/config{.,-}guess
-cp -p build-aux/config{.,-}sub
-%configure
-# ... and restore them:
-mv build-aux/config{-,.}guess
-mv build-aux/config{-,.}sub
+./configure --prefix=%{_prefix} --mandir=%{_mandir} --infodir=%{_infodir} \
+  --bindir=%{_bindir} --datadir=%{_datadir}
 make #  %{?_smp_mflags}  Makefile not smp save
 
 #check
@@ -74,6 +75,10 @@ fi
 %doc AUTHORS COPYING ChangeLog NEWS README THANKS TODO
 
 %changelog
+* Mon Feb 19 2007 Karsten Hopp <karsten@redhat.com> 2.61-5
+- use ./configure
+- filter dependencies
+
 * Thu Feb 15 2007 Karsten Hopp <karsten@redhat.com> 2.61-4
 - add disttag
 - replace  tabs with spaces
diff --git a/filter-provides-automake.sh b/filter-provides-automake.sh
new file mode 100755
index 0000000..20bf706
--- /dev/null
+++ b/filter-provides-automake.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+/usr/lib/rpm/find-provides $* | egrep -v 'perl\(Autom4te' | sort -u
diff --git a/filter-requires-automake.sh b/filter-requires-automake.sh
new file mode 100755
index 0000000..596c465
--- /dev/null
+++ b/filter-requires-automake.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+/usr/lib/rpm/find-requires $* | egrep -v 'perl\(Autom4te' | sort -u