diff --git a/bind-9.6.1P3.tar.gz b/bind-9.6.1P3.tar.gz
deleted file mode 100644
index 76a339b..0000000
--- a/bind-9.6.1P3.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b48b5c0d2f8f670fd35178db62a4eb2327b9d73e7680dfa47a54d96ace8cf769
-size 6599680
diff --git a/bind-9.7.0.tar.gz b/bind-9.7.0.tar.gz
new file mode 100644
index 0000000..558f76c
--- /dev/null
+++ b/bind-9.7.0.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:35d0281b313b038600ea3a20d08e9d4736e5a69e950cc3aac14ae7433061dcb3
+size 7123585
diff --git a/bind.changes b/bind.changes
index 6b02d30..98f337a 100644
--- a/bind.changes
+++ b/bind.changes
@@ -1,3 +1,29 @@
+-------------------------------------------------------------------
+Wed Feb 17 12:27:56 CET 2010 - ug@suse.de
+
+- Fully automatic signing of zones by "named".
+- Simplified configuration of DNSSEC Lookaside Validation (DLV).
+- Simplified configuration of Dynamic DNS, using the "ddns-confgen"
+  command line tool or the "local" update-policy option.  (As a side
+  effect, this also makes it easier to configure automatic zone
+  re-signing.)
+- New named option "attach-cache" that allows multiple views to
+  share a single cache.
+- DNS rebinding attack prevention.
+- New default values for dnssec-keygen parameters.
+- Support for RFC 5011 automated trust anchor maintenance
+- Smart signing: simplified tools for zone signing and key
+  maintenance.
+- The "statistics-channels" option is now available on Windows.
+- A new DNSSEC-aware libdns API for use by non-BIND9 applications
+- On some platforms, named and other binaries can now print out
+  a stack backtrace on assertion failure, to aid in debugging.
+- A "tools only" installation mode on Windows, which only installs
+  dig, host, nslookup and nsupdate.
+- Improved PKCS#11 support, including Keyper support and explicit
+  OpenSSL engine selection.
+- version 9.7.0
+
 -------------------------------------------------------------------
 Wed Jan 20 10:06:22 CET 2010 - ug@suse.de
 
diff --git a/bind.spec b/bind.spec
index e452caa..84dc0e5 100644
--- a/bind.spec
+++ b/bind.spec
@@ -20,13 +20,12 @@
 
 Name:           bind
 %define pkg_name bind
-%define pkg_vers 9.6.1P3
+%define pkg_vers 9.7.0
 #BuildRequires:  openldap2 openldap2-devel
 BuildRequires:  libcap libcap-devel libmysqlclient-devel libxml2-devel openssl openssl-devel
 Summary:        Domain Name System (DNS) Server (named)
-Version:        9.6.1P3
+Version:        9.7.0
 Release:        1
-%define       SDB_LDAP_VERSION      1.0-beta
 License:        BSD3c(or similar) ; MIT License (or similar)
 Group:          Productivity/Networking/DNS/Servers
 Provides:       dns_daemon bind8 bind9
@@ -40,12 +39,10 @@ Source1:        vendor-files.tar.bz2
 Source2:        baselibs.conf
 Source9:        ftp://ftp.internic.net/domain/named.root
 Source40:       http://www.venaas.no/ldap/bind-sdb/dnszone-schema.txt
-#Source50:       bind-sdb-ldap-%{SDB_LDAP_VERSION}.tar.gz
 Patch:          configure.in.diff
 Patch1:         Makefile.in.diff
 Patch2:         pid-path.diff
 Patch4:         perl-path.diff
-#Patch50:        sdb_ldap.diff
 Patch51:        pie_compile.diff
 Patch52:        named-bootconf.diff
 %if %ul_version >= 1
@@ -678,6 +675,7 @@ fi
 %config(noreplace) %{_sysconfdir}/idnalias.conf
 %dir /etc/named.d
 %config(noreplace) /etc/named.d/rndc-access.conf
+%config(noreplace) /etc/bind.keys
 %dir %{_sysconfdir}/openldap
 %dir %{_sysconfdir}/openldap/schema
 %attr(0444,root,root) %config %{_sysconfdir}/openldap/schema/dnszone.schema
@@ -692,6 +690,14 @@ fi
 %{_sbindir}/dnssec-keyfromlabel
 %{_sbindir}/rndc
 %{_sbindir}/rndc-confgen
+%{_sbindir}/arpaname
+%{_sbindir}/ddns-confgen
+%{_sbindir}/dnssec-revoke
+%{_sbindir}/dnssec-settime
+%{_sbindir}/genrandom
+%{_sbindir}/isc-hmac-fixup
+%{_sbindir}/named-journalprint
+%{_sbindir}/nsec3hash
 %dir %{_datadir}/idnkit
 %{_datadir}/idnkit/jp.map
 %dir %doc %{_defaultdocdir}/bind
@@ -704,6 +710,14 @@ fi
 %doc %{_mandir}/man1/nsupdate.1.gz
 %doc %{_mandir}/man8/rndc-confgen.8.gz
 %doc %{_mandir}/man8/rndc.8.gz
+%doc %{_mandir}/man1/arpaname.1.gz
+%doc %{_mandir}/man8/ddns-confgen.8.gz
+%doc %{_mandir}/man8/dnssec-revoke.8.gz
+%doc %{_mandir}/man8/dnssec-settime.8.gz
+%doc %{_mandir}/man8/genrandom.8.gz
+%doc %{_mandir}/man8/isc-hmac-fixup.8.gz
+%doc %{_mandir}/man8/named-journalprint.8.gz
+%doc %{_mandir}/man8/nsec3hash.8.gz
 # idn kit
 %doc %{_mandir}/man1/idnconv.1.gz
 %doc %{_mandir}/man1/runidn.1.gz
diff --git a/pie_compile.diff b/pie_compile.diff
index fa0f860..de54d71 100644
--- a/pie_compile.diff
+++ b/pie_compile.diff
@@ -1,3 +1,74 @@
+--- bin/Makefile.in
++++ bin/Makefile.in	2010/02/17 10:54:34
+@@ -23,4 +23,8 @@
+ 		check confgen @PKCS11_TOOLS@
+ TARGETS =
+ 
++EXT_CFLAGS = -fPIE
++
+ @BIND9_MAKE_RULES@
++
++LDFLAGS   += -pie
+--- bin/dig/Makefile.in
++++ bin/dig/Makefile.in	2010/02/17 10:52:39
+@@ -67,8 +67,12 @@
+ 
+ MANOBJS =	${MANPAGES} ${HTMLPAGES}
+ 
++EXT_CFLAGS = -fPIE
++
+ @BIND9_MAKE_RULES@
+ 
++LDFLAGS   += -pie
++
+ dig@EXEEXT@: dig.@O@ dighost.@O@ ${UOBJS} ${DEPLIBS}
+ 	export BASEOBJS="dig.@O@ dighost.@O@ ${UOBJS}"; \
+ 	${FINALBUILDCMD}
+--- bin/dnssec/Makefile.in
++++ bin/dnssec/Makefile.in	2010/02/17 10:53:51
+@@ -60,8 +60,12 @@
+ 
+ MANOBJS =	${MANPAGES} ${HTMLPAGES}
+ 
++EXT_CFLAGS = -fPIE
++
+ @BIND9_MAKE_RULES@
+ 
++LDFLAGS   += -pie
++
+ dnssec-dsfromkey@EXEEXT@: dnssec-dsfromkey.@O@ ${OBJS} ${DEPLIBS}
+ 	export BASEOBJS="dnssec-dsfromkey.@O@ ${OBJS}"; \
+ 	${FINALBUILDCMD}
+--- bin/nsupdate/Makefile.in
++++ bin/nsupdate/Makefile.in	2010/02/17 10:55:42
+@@ -64,8 +64,12 @@
+ 
+ MANOBJS =	${MANPAGES} ${HTMLPAGES}
+ 
++EXT_CFLAGS = -fPIE
++
+ @BIND9_MAKE_RULES@
+ 
++LDFLAGS   += -pie
++
+ nsupdate.@O@: nsupdate.c
+ 	${LIBTOOL_MODE_COMPILE} ${CC} ${ALL_CFLAGS} \
+ 		-DSESSION_KEYFILE=\"${localstatedir}/run/named/session.key\" \
+--- bin/rndc/Makefile.in
++++ bin/rndc/Makefile.in	2010/02/17 10:57:03
+@@ -59,8 +59,12 @@
+ 
+ MANOBJS =	${MANPAGES} ${HTMLPAGES}
+ 
++EXT_CFLAGS = -fPIE
++
+ @BIND9_MAKE_RULES@
+ 
++LDFLAGS   += -pie
++
+ rndc.@O@: rndc.c
+ 	${LIBTOOL_MODE_COMPILE} ${CC} ${ALL_CFLAGS} \
+ 		-DVERSION=\"${VERSION}\" \
 --- bin/check/Makefile.in
 +++ bin/check/Makefile.in	2005/06/17 13:01:56
 @@ -55,8 +55,12 @@
@@ -13,47 +84,6 @@
  named-checkconf.@O@: named-checkconf.c
  	${LIBTOOL_MODE_COMPILE} ${CC} ${ALL_CFLAGS} \
  		-DVERSION=\"${VERSION}\" \
---- bin/dig/Makefile.in
-+++ bin/dig/Makefile.in	2005/06/17 13:02:54
-@@ -63,8 +63,12 @@
- 
- MANOBJS =	${MANPAGES} ${HTMLPAGES}
- 
-+EXT_CFLAGS = -fPIE
-+
- @BIND9_MAKE_RULES@
- 
-+LDFLAGS   += -pie
-+
- dig@EXEEXT@: dig.@O@ dighost.@O@ ${UOBJS} ${DEPLIBS}
- 	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ \
- 	dig.@O@ dighost.@O@ ${UOBJS} ${LIBS}
---- bin/dnssec/Makefile.in
-+++ bin/dnssec/Makefile.in	2005/06/17 13:03:30
-@@ -51,8 +51,12 @@
- 
- MANOBJS =	${MANPAGES} ${HTMLPAGES}
- 
-+EXT_CFLAGS = -fPIE
-+
- @BIND9_MAKE_RULES@
- 
-+LDFLAGS   += -pie
-+
- dnssec-dsfromkey@EXEEXT@: dnssec-dsfromkey.@O@ ${OBJS} ${DEPLIBS}
- 	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ \
- 	dnssec-dsfromkey.@O@ ${OBJS} ${LIBS}
---- bin/Makefile.in
-+++ bin/Makefile.in	2005/06/17 12:52:58
-@@ -22,4 +22,8 @@
- SUBDIRS =	named rndc dig dnssec tests nsupdate check
- TARGETS =
- 
-+EXT_CFLAGS = -fPIE
-+
- @BIND9_MAKE_RULES@
-+
-+LDFLAGS   += -pie
 --- bin/named/Makefile.in
 +++ bin/named/Makefile.in	2005/06/17 12:41:37
 @@ -91,8 +91,12 @@
@@ -78,24 +108,9 @@
 +EXT_CFLAGS = -fPIE
 +
  @BIND9_MAKE_RULES@
---- bin/nsupdate/Makefile.in
-+++ bin/nsupdate/Makefile.in	2005/06/17 13:04:16
-@@ -61,8 +61,12 @@
- 
- MANOBJS =	${MANPAGES} ${HTMLPAGES}
- 
-+EXT_CFLAGS = -fPIE
-+
- @BIND9_MAKE_RULES@
- 
-+LDFLAGS   += -pie
-+
- nsupdate@EXEEXT@: nsupdate.@O@ ${UOBJS} ${DEPLIBS}
- 	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ nsupdate.@O@ ${UOBJS} ${LIBS}
- 
---- bin/rndc/Makefile.in
-+++ bin/rndc/Makefile.in	2005/06/17 13:04:51
-@@ -59,8 +59,12 @@
+--- bin/confgen/Makefile.in
++++ bin/confgen/Makefile.in	2010/02/17 11:09:01
+@@ -64,8 +64,12 @@
  
  UOBJS =		unix/os.@O@
  
@@ -105,15 +120,6 @@
  
 +LDFLAGS   += -pie
 +
- rndc.@O@: rndc.c
+ rndc-confgen.@O@: rndc-confgen.c
  	${LIBTOOL_MODE_COMPILE} ${CC} ${ALL_CFLAGS} \
- 		-DVERSION=\"${VERSION}\" \
---- bin/rndc/unix/Makefile.in
-+++ bin/rndc/unix/Makefile.in	2005/06/17 13:05:14
-@@ -33,4 +33,6 @@
- 
- TARGETS =	${OBJS}
- 
-+EXT_CFLAGS = -fPIE
-+
- @BIND9_MAKE_RULES@
+ 		-DRNDC_KEYFILE=\"${sysconfdir}/rndc.key\" \