diff --git a/.cvsignore b/.cvsignore
index e66a330..a9afba7 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -2,3 +2,4 @@ bind-9.5.0a5.tar.gz
 bind-chroot.tar.bz2
 config.tar
 libbind-man.tar.gz
+bind-9.5.0a5-autotools.tar.bz2
diff --git a/bind-9.3.1rc1-sdb.patch b/bind-9.3.1rc1-sdb.patch
index 2433a34..95b9a8c 100644
--- a/bind-9.3.1rc1-sdb.patch
+++ b/bind-9.3.1rc1-sdb.patch
@@ -1,5 +1,5 @@
---- bind-9.4.0/configure.in.sdb	2007-03-06 12:59:32.000000000 +0100
-+++ bind-9.4.0/configure.in	2007-03-06 12:59:32.000000000 +0100
+--- bind-9.4.0/configure.ac.sdb	2007-03-06 12:59:32.000000000 +0100
++++ bind-9.4.0/configure.ac	2007-03-06 12:59:32.000000000 +0100
 @@ -2478,6 +2478,7 @@
  	bin/tests/system/tkey/Makefile
  	bin/tests/headerdep_test.sh
diff --git a/bind.spec b/bind.spec
index 0e16d21..eb0348e 100644
--- a/bind.spec
+++ b/bind.spec
@@ -18,7 +18,7 @@ Summary: 	The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) serv
 Name: 		bind
 License: 	BSD-like
 Version: 	9.5.0a5
-Release: 	4.1%{?dist}
+Release: 	5%{?dist}
 Epoch:   	31
 Url: 		http://www.isc.org/products/BIND/
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -44,6 +44,7 @@ Source22: 	bind-chroot-admin.in
 Source24:	libbind.pc
 Source25:	named.conf.sample
 Source28:	config.tar
+Source29:	bind-%{version}-autotools.tar.bz2
 
 # Common patches
 Patch0:  	bind-9.2.0rc3-varrun.patch
@@ -181,6 +182,9 @@ Based off code from Jan "Yenya" Kasprzak <kas@fi.muni.cz>
 %prep
 %setup -q -n %{name}-%{version}
 
+tar -xvf %{SOURCE29}
+patch -p1 -b < patch
+
 # Common patches
 %patch -p1 -b .varrun
 %patch1 -p1 -b .key
@@ -403,7 +407,7 @@ for f in my.internal.zone.db slaves/my.slave.internal.zone.db slaves/my.ddns.int
   echo '@ in soa localhost. root 1 3H 15M 1W 1D
   ns localhost.' > sample/var/named/$f; 
 done
-/usr/bin/tail -n '+'`/bin/egrep -n '\\$Id: bind.spec,v 1.197 2007/07/23 14:27:48 atkac Exp $/+1/' | bc` bin/rndc/rndc.conf | sed '/Sample rndc configuration file./{p;i\
+/usr/bin/tail -n '+'`/bin/egrep -n '\\$Id: bind.spec,v 1.198 2007/07/23 17:55:02 atkac Exp $/+1/' | bc` bin/rndc/rndc.conf | sed '/Sample rndc configuration file./{p;i\
  *\
  * NOTE: you only need to create this file if it is to\
  * differ from the following default contents:
@@ -682,6 +686,10 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_sbindir}/bind-chroot-admin
 
 %changelog
+* Mon Jul 21 2007 Adam Tkac <atkac redhat com> 31:9.5.0a5-5.fc8
+- integrated "autotools" patch for testing purposes (upstream will
+  accept it in future, for easier building)
+
 * Mon Jul 21 2007 Adam Tkac <atkac redhat com> 31:9.5.0a5-4.1.fc8
 - fixed DLZ drivers building on 64bit systems
 
diff --git a/sources b/sources
index c0f0c5b..635f76a 100644
--- a/sources
+++ b/sources
@@ -2,3 +2,4 @@ beb3f6e7e8e1f804d1fb79dd11319e1e  bind-9.5.0a5.tar.gz
 4faa4395b955e5f8a3d50f308b9fabc8  bind-chroot.tar.bz2
 bdea8168751a29e61525f11e8195ad48  config.tar
 13fef79f99fcefebb51d84b08805de51  libbind-man.tar.gz
+ab617c4f99feb2af6e384df8ebe5a9ec  bind-9.5.0a5-autotools.tar.bz2