diff --git a/debian/changelog b/debian/changelog
index d055087..80add85 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,8 +5,10 @@ nagios-plugins (1.4.2-6) unreleased; urgency=low
   * add 23_check_axis.dpatch, making the package suiteable to
     debian/-only layout
   * convert to debian/-only layout
+  * add build-dependency on autotools-dev, add code to automatically
+    link in current config.guess, config.sub
 
- -- Marc Haber <mh+debian-packages@zugschlus.de>  Fri, 20 Jan 2006 19:01:25 +0000
+ -- Marc Haber <mh+debian-packages@zugschlus.de>  Fri, 20 Jan 2006 19:05:15 +0000
 
 nagios-plugins (1.4.2-5) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 4f58194..f84dffe 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: net
 Priority: extra
 Maintainer: Debian Nagios Maintainer Group <pkg-nagios-devel@lists.alioth.debian.org>
 Uploaders: sean finney <seanius@debian.org>, Guido Trotter <ultrotter@debian.org>
-Build-Depends: debhelper (>= 4.0.0), dpatch (>= 2.0.9), libldap2-dev, postgresql-dev, libmysqlclient14-dev | libmysqlclient-dev, libsnmp9-dev | libsnmp-dev, libradius1-dev, libkrb5-dev, libnet-snmp-perl, procps, coreutils | fileutils, iputils-ping, dnsutils, bind9-host | host, snmp, mawk | awk
+Build-Depends: debhelper (>= 4.0.0), dpatch (>= 2.0.9), autotools-dev, libldap2-dev, postgresql-dev, libmysqlclient14-dev | libmysqlclient-dev, libsnmp9-dev | libsnmp-dev, libradius1-dev, libkrb5-dev, libnet-snmp-perl, procps, coreutils | fileutils, iputils-ping, dnsutils, bind9-host | host, snmp, mawk | awk
 Standards-Version: 3.6.2
 
 Package: nagios-plugins
diff --git a/debian/rules b/debian/rules
index e38c2f6..b384679 100755
--- a/debian/rules
+++ b/debian/rules
@@ -44,6 +44,10 @@ endif
 config.status: configure
 	export PATH=$(PATH)
 	dh_testdir
+	ln -sf /usr/share/misc/config.sub .
+	ln -sf /usr/share/misc/config.guess .
+	rm -f config.cache
+	
 	# Add here commands to configure the package.
 	EXTRAS="check_game check_fping check_by_ssh" CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info --libexecdir=${NP_LIBEXEC} --with-nagios-user=nagios --with-nagios-group=nagios --with-trusted-path=/bin:/sbin:/usr/bin:/usr/sbin --with-df-command="/bin/df -Pk"
 
@@ -67,6 +71,10 @@ really-clean:
 
 	# Add here commands to clean up after the build process.
 	-$(MAKE) distclean
+	find -type d -name autom4te.cache -print0 | xargs -0 -r rm -rf \;
+	-rm -f platform.h auto-include.h
+	find -type d -name build -print0 | xargs -0 -r rm -rf \;
+	find \( -name config.sub -o -name config.guess \) -print0 | xargs -0 -r rm -f \;
 	dh_clean 
 
 install: build