diff --git a/README.sdb_pgsql b/README.sdb_pgsql
deleted file mode 100644
index c10c294..0000000
--- a/README.sdb_pgsql
+++ /dev/null
@@ -1,79 +0,0 @@
-			PGSQL BIND SDB driver
-
-The postgresql BIND SDB driver is of experimental status and should not be 
-used for production systems.
-
-Usage:
-
-o Use the named_sdb process ( put ENABLE_SDB=yes in /etc/sysconfig/named )
-
-o Edit your named.conf to contain a database zone, eg. :
-  
-zone "pgdb.net." IN {
-        type master;
-        database "pgsql  bind        pgdb     localhost pguser pgpasswd";
-        #                ^- DB name  ^-Table  ^-host    ^-user ^-password
-};
-
-o Create the database zone table
-  The table must contain the columns "name", "rdtype", and "rdata", and
-  is expected to contain a properly constructed zone.  The program "zonetodb"
-  creates such a table.
-  
-  zonetodb usage:
-    
-    zonetodb origin file dbname dbtable
-
-    where
-	origin : zone origin, eg "pgdb.net."
-	file   : master zone database file, eg. pgdb.net.db
-	dbname : name of postgresql database 
-        dbtable: name of table in database
-
-    Eg. to import this zone in the file 'pgdb.net.db' into the 'bind' database 
-        'pgdb' table:
-
----
-#pgdb.net.db:
-$TTL 1H
-@       SOA     localhost.      root.localhost. (       1
-                                                3H
-                                                1H
-                                                1W
-                                                1H )
-        NS      localhost.
-host1   A       192.168.2.1
-host2   A       192.168.2.2
-host3   A       192.168.2.3
-host4   A       192.168.2.4
-host5   A       192.168.2.5
-host6   A       192.168.2.6
-host7   A       192.168.2.7
----
-
-Issue this command as the pgsql user authorized to update the bind database:
- 
-# zonetodb pgdb.net. pgdb.net.db bind pgdb
-
-will create / update the pgdb table in the 'bind' db:
-
-$ psql -dbind -c 'select * from pgdb;'
-      name      | ttl  | rdtype |                        rdata
-----------------+------+--------+-----------------------------------------------------
- pgdb.net       | 3600 | SOA    | localhost. root.localhost. 1 10800 3600 604800 3600
- pgdb.net       | 3600 | NS     | localhost.
- host1.pgdb.net | 3600 | A      | 192.168.2.1
- host2.pgdb.net | 3600 | A      | 192.168.2.2
- host3.pgdb.net | 3600 | A      | 192.168.2.3
- host4.pgdb.net | 3600 | A      | 192.168.2.4
- host5.pgdb.net | 3600 | A      | 192.168.2.5
- host6.pgdb.net | 3600 | A      | 192.168.2.6
- host7.pgdb.net | 3600 | A      | 192.168.2.7
-(9 rows)
-
-I've tested exactly the above configuration with bind-sdb-9.3.1+ and it works OK.
-
-NOTE: If you use pgsqldb SDB, ensure the postgresql service is started before the named
-      service .
-
-USE AT YOUR OWN RISK!
diff --git a/bind-9.10-sdb.patch b/bind-9.10-sdb.patch
deleted file mode 100644
index ef9a8dc..0000000
--- a/bind-9.10-sdb.patch
+++ /dev/null
@@ -1,319 +0,0 @@
-diff --git a/bin/Makefile.in b/bin/Makefile.in
-index ce7a2da..4e6a824 100644
---- a/bin/Makefile.in
-+++ b/bin/Makefile.in
-@@ -11,8 +11,8 @@ srcdir =	@srcdir@
- VPATH =		@srcdir@
- top_srcdir =	@top_srcdir@
- 
--SUBDIRS =	named named-pkcs11 rndc dig delv dnssec dnssec-pkcs11 tools nsupdate \
--		check confgen @NZD_TOOLS@ @PYTHON_TOOLS@ @PKCS11_TOOLS@ tests
-+SUBDIRS =	named named-sdb named-pkcs11 rndc dig delv dnssec dnssec-pkcs11 tools nsupdate \
-+		check confgen @NZD_TOOLS@ @PYTHON_TOOLS@ @PKCS11_TOOLS@ sdb_tools tests
- TARGETS =
- 
- @BIND9_MAKE_RULES@
-diff --git a/bin/named-sdb/Makefile.in b/bin/named-sdb/Makefile.in
-index 4cfed4d..c6b42b2 100644
---- a/bin/named-sdb/Makefile.in
-+++ b/bin/named-sdb/Makefile.in
-@@ -30,10 +30,10 @@ VERSION=@BIND9_VERSION@
- #
- # Add database drivers here.
- #
--DBDRIVER_OBJS =
--DBDRIVER_SRCS =
-+DBDRIVER_OBJS =	ldapdb.@O@ pgsqldb.@O@ sqlitedb.@O@ dirdb.@O@
-+DBDRIVER_SRCS =	ldapdb.c pgsqldb.c sqlitedb.c dirdb.c
- DBDRIVER_INCLUDES =
--DBDRIVER_LIBS =
-+DBDRIVER_LIBS =	-lldap -llber -lsqlite3 -lpq
- 
- DLZ_DRIVER_DIR =	${top_srcdir}/contrib/dlz/drivers
- 
-@@ -80,7 +80,7 @@ NOSYMLIBS =	${LWRESLIBS} ${DNSLIBS} ${BIND9LIBS} \
- 
- SUBDIRS =	unix
- 
--TARGETS =	named@EXEEXT@ lwresd@EXEEXT@ feature-test@EXEEXT@
-+TARGETS =	named-sdb@EXEEXT@ feature-test-sdb@EXEEXT@
- 
- GEOIPLINKOBJS = geoip.@O@
- GEOIP2LINKOBJS = geoip.@O@
-@@ -154,7 +154,7 @@ server.@O@: server.c
- 		-DPRODUCT=\"${PRODUCT}\" \
- 		-DVERSION=\"${VERSION}\" -c ${srcdir}/server.c
- 
--named@EXEEXT@: ${OBJS} ${DEPLIBS}
-+named-sdb@EXEEXT@: ${OBJS} ${DEPLIBS}
- 	export MAKE_SYMTABLE="yes"; \
- 	export BASEOBJS="${OBJS} ${UOBJS}"; \
- 	${FINALBUILDCMD}
-@@ -168,7 +168,7 @@ feature-test.@O@: ${top_srcdir}/bin/tests/system/feature-test.c
- 	${LIBTOOL_MODE_COMPILE} ${CC} ${ALL_CFLAGS} \
- 		-c ${top_srcdir}/bin/tests/system/feature-test.c
- 
--feature-test@EXEEXT@: feature-test.@O@
-+feature-test-sdb@EXEEXT@: feature-test.@O@
- 	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} \
- 		-o $@ feature-test.@O@ ${ISCLIBS} ${LIBS}
- 
-@@ -190,8 +190,6 @@ statschannel.@O@: bind9.xsl.h
- 
- installdirs:
- 	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${sbindir}
--	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${mandir}/man5
--	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${mandir}/man8
- 
- install-man5: named.conf.5
- 	${INSTALL_DATA} $^ ${DESTDIR}${mandir}/man5
-@@ -201,16 +199,11 @@ install-man8: named.8 lwresd.8
- 
- install-man: install-man5 install-man8
- 
--install:: named@EXEEXT@ lwresd@EXEEXT@ installdirs install-man
--	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} named@EXEEXT@ ${DESTDIR}${sbindir}
--	(cd ${DESTDIR}${sbindir}; rm -f lwresd@EXEEXT@; @LN@ named@EXEEXT@ lwresd@EXEEXT@)
-+install:: ${TARGETS} installdirs
-+	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} named-sdb@EXEEXT@ ${DESTDIR}${sbindir}
- 
- uninstall::
--	rm -f ${DESTDIR}${mandir}/man5/named.conf.5
--	rm -f ${DESTDIR}${mandir}/man8/lwresd.8
--	rm -f ${DESTDIR}${mandir}/man8/named.8
--	rm -f ${DESTDIR}${sbindir}/lwresd@EXEEXT@
--	${LIBTOOL_MODE_UNINSTALL} rm -f ${DESTDIR}${sbindir}/named@EXEEXT@
-+	${LIBTOOL_MODE_UNINSTALL} rm -f ${DESTDIR}${sbindir}/named-sdb@EXEEXT@
- 
- @DLZ_DRIVER_RULES@
- 
-diff --git a/bin/named-sdb/main.c b/bin/named-sdb/main.c
-index 108b8d6..a943421 100644
---- a/bin/named-sdb/main.c
-+++ b/bin/named-sdb/main.c
-@@ -93,6 +93,10 @@
-  * Include header files for database drivers here.
-  */
- /* #include "xxdb.h" */
-+#include "ldapdb.h"
-+#include "pgsqldb.h"
-+#include "sqlitedb.h"
-+#include "dirdb.h"
- 
- #ifdef CONTRIB_DLZ
- /*
-@@ -1069,6 +1073,11 @@ setup(void) {
- 		ns_main_earlyfatal("isc_app_start() failed: %s",
- 				   isc_result_totext(result));
- 
-+	ldapdb_clear();
-+	pgsqldb_clear();
-+	dirdb_clear();
-+	sqlitedb_clear();
-+
- 	isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
- 		      ISC_LOG_NOTICE, "starting %s %s%s%s <id:%s>",
- 		      ns_g_product, ns_g_version,
-@@ -1269,6 +1278,75 @@ setup(void) {
- 				   isc_result_totext(result));
- #endif
- 
-+        result = ldapdb_init();
-+        if (result != ISC_R_SUCCESS)
-+        {
-+            isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
-+                          ISC_LOG_ERROR, 
-+                          "SDB ldap module initialisation failed: %s.",
-+                          isc_result_totext(result)
-+                );
-+            isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
-+                          ISC_LOG_ERROR, 
-+                          "SDB ldap zone database will be unavailable."
-+                );
-+        }else
-+            isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
-+                          ISC_LOG_NOTICE, "SDB ldap zone database module loaded."
-+                         );
-+
-+        result = pgsqldb_init();
-+        if (result != ISC_R_SUCCESS)
-+        {
-+            isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
-+                          ISC_LOG_ERROR, 
-+                          "SDB pgsql module initialisation failed: %s.",
-+                          isc_result_totext(result)
-+                );
-+            isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
-+                          ISC_LOG_ERROR, 
-+                          "SDB pgsql zone database will be unavailable."
-+                );
-+        }else
-+            isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
-+                          ISC_LOG_NOTICE, "SDB postgreSQL DB zone database module loaded."
-+                         );
-+
-+        result = sqlitedb_init();
-+        if (result != ISC_R_SUCCESS)
-+        {
-+             isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
-+                          ISC_LOG_ERROR, 
-+                          "SDB sqlite3 module initialisation failed: %s.",
-+                          isc_result_totext(result)
-+                );
-+            isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
-+                          ISC_LOG_ERROR, 
-+                          "SDB sqlite3 zone database will be unavailable."
-+                );
-+        }else
-+            isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
-+                          ISC_LOG_NOTICE, "SDB sqlite3 DB zone database module loaded."
-+                         );
-+
-+        result = dirdb_init();
-+        if (result != ISC_R_SUCCESS)
-+        {
-+            isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
-+                          ISC_LOG_ERROR, 
-+                          "SDB directory DB module initialisation failed: %s.",
-+                          isc_result_totext(result)
-+                );
-+            isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
-+                          ISC_LOG_ERROR, 
-+                          "SDB directory DB zone database will be unavailable."
-+                );
-+        }else
-+            isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
-+                          ISC_LOG_NOTICE, "SDB directory DB zone database module loaded."
-+                         );
-+
-+
- 	ns_server_create(ns_g_mctx, &ns_g_server);
- 
- #ifdef HAVE_LIBSECCOMP
-@@ -1311,6 +1389,11 @@ cleanup(void) {
- 
- 	dns_name_destroy();
- 
-+	ldapdb_clear();
-+	pgsqldb_clear();
-+	sqlitedb_clear();
-+	dirdb_clear();
-+
- 	isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
- 		      ISC_LOG_NOTICE, "exiting");
- 	ns_log_shutdown();
-diff --git a/bin/named/Makefile.in b/bin/named/Makefile.in
-index 4cfed4d..f4bce7b 100644
---- a/bin/named/Makefile.in
-+++ b/bin/named/Makefile.in
-@@ -45,10 +45,10 @@ DLZDRIVER_LIBS =	@DLZ_DRIVER_LIBS@
- CINCLUDES =	-I${srcdir}/include -I${srcdir}/unix/include -I. \
- 		${LWRES_INCLUDES} ${DNS_INCLUDES} ${BIND9_INCLUDES} \
- 		${ISCCFG_INCLUDES} ${ISCCC_INCLUDES} ${ISC_INCLUDES} \
--		${DLZDRIVER_INCLUDES} ${DBDRIVER_INCLUDES} ${MAXMINDDB_CFLAGS} \
-+		${MAXMINDDB_CFLAGS} \
- 		@DST_OPENSSL_INC@
- 
--CDEFINES =      @CONTRIB_DLZ@ @USE_GSSAPI@ @CRYPTO@
-+CDEFINES =      @USE_GSSAPI@ @CRYPTO@
- 
- CWARNINGS =
- 
-@@ -72,11 +72,11 @@ DEPLIBS =	${LWRESDEPLIBS} ${DNSDEPLIBS} ${BIND9DEPLIBS} \
- 
- LIBS =		${LWRESLIBS} ${DNSLIBS} ${BIND9LIBS} \
- 		${ISCCFGLIBS} ${ISCCCLIBS} ${ISCLIBS} \
--		${DLZDRIVER_LIBS} ${DBDRIVER_LIBS} @LIBS@
-+		@LIBS@
- 
- NOSYMLIBS =	${LWRESLIBS} ${DNSLIBS} ${BIND9LIBS} \
- 		${ISCCFGLIBS} ${ISCCCLIBS} ${ISCNOSYMLIBS} \
--		${DLZDRIVER_LIBS} ${DBDRIVER_LIBS} @LIBS@
-+		@LIBS@
- 
- SUBDIRS =	unix
- 
-@@ -94,8 +94,7 @@ OBJS =		builtin.@O@ client.@O@ config.@O@ control.@O@ \
- 		tkeyconf.@O@ tsigconf.@O@ update.@O@ xfrout.@O@ \
- 		zoneconf.@O@ \
- 		lwaddr.@O@ lwresd.@O@ lwdclient.@O@ lwderror.@O@ lwdgabn.@O@ \
--		lwdgnba.@O@ lwdgrbn.@O@ lwdnoop.@O@ lwsearch.@O@ \
--		${DLZDRIVER_OBJS} ${DBDRIVER_OBJS}
-+		lwdgnba.@O@ lwdgrbn.@O@ lwdnoop.@O@ lwsearch.@O@
- 
- UOBJS =		unix/os.@O@ unix/dlz_dlopen_driver.@O@
- 
-@@ -113,8 +112,7 @@ SRCS =		builtin.c client.c config.c control.c \
- 		tkeyconf.c tsigconf.c update.c xfrout.c \
- 		zoneconf.c \
- 		lwaddr.c lwresd.c lwdclient.c lwderror.c lwdgabn.c \
--		lwdgnba.c lwdgrbn.c lwdnoop.c lwsearch.c \
--		${DLZDRIVER_SRCS} ${DBDRIVER_SRCS}
-+		lwdgnba.c lwdgrbn.c lwdnoop.c lwsearch.c
- 
- MANPAGES =	named.8 lwresd.8 named.conf.5
- 
-@@ -212,7 +210,5 @@ uninstall::
- 	rm -f ${DESTDIR}${sbindir}/lwresd@EXEEXT@
- 	${LIBTOOL_MODE_UNINSTALL} rm -f ${DESTDIR}${sbindir}/named@EXEEXT@
- 
--@DLZ_DRIVER_RULES@
--
- named-symtbl.@O@: named-symtbl.c
- 	${LIBTOOL_MODE_COMPILE} ${CC} ${ALL_CFLAGS} -c named-symtbl.c
-diff --git a/bin/sdb_tools/Makefile.in b/bin/sdb_tools/Makefile.in
-index c7e0868..95ab742 100644
---- a/bin/sdb_tools/Makefile.in
-+++ b/bin/sdb_tools/Makefile.in
-@@ -32,11 +32,11 @@ DEPLIBS =	${LWRESDEPLIBS} ${DNSDEPLIBS} ${BIND9DEPLIBS} \
- LIBS =		${LWRESLIBS} ${DNSLIBS} ${BIND9LIBS} \
- 		${ISCCFGLIBS} ${ISCCCLIBS} ${ISCLIBS} ${DBDRIVER_LIBS} @LIBS@
- 
--TARGETS =	zone2ldap@EXEEXT@ zonetodb@EXEEXT@
-+TARGETS =	zone2ldap@EXEEXT@ zonetodb@EXEEXT@ zone2sqlite@EXEEXT@
- 
--OBJS	=	zone2ldap.@O@ zonetodb.@O@
-+OBJS	=	zone2ldap.@O@ zonetodb.@O@ zone2sqlite.@O@
- 
--SRCS    =       zone2ldap.c zonetodb.c
-+SRCS    =       zone2ldap.c zonetodb.c zone2sqlite.c
- 
- MANPAGES =      zone2ldap.1
- 
-@@ -50,6 +50,9 @@ zone2ldap@EXEEXT@: zone2ldap.@O@ ${DEPLIBS}
- zonetodb@EXEEXT@: zonetodb.@O@  ${DEPLIBS}
- 	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ zonetodb.@O@ -lpq ${LIBS}
- 
-+zone2sqlite@EXEEXT@: zone2sqlite.@O@  ${DEPLIBS}
-+	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${ALL_CFLAGS} ${LDFLAGS} -o $@ zone2sqlite.@O@ -lsqlite3 -lssl ${LIBS}
-+
- clean distclean manclean maintainer-clean::
- 	rm -f ${TARGETS} ${OBJS}
- 
-@@ -60,4 +63,5 @@ installdirs:
- install:: ${TARGETS} installdirs
- 	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} zone2ldap@EXEEXT@ ${DESTDIR}${sbindir}
- 	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} zonetodb@EXEEXT@  ${DESTDIR}${sbindir}
-+	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} zone2sqlite@EXEEXT@ ${DESTDIR}${sbindir}
- 	${INSTALL_DATA} ${srcdir}/zone2ldap.1 ${DESTDIR}${mandir}/man1/zone2ldap.1
-diff --git a/configure.ac b/configure.ac
-index f6380b1..318e533 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -5416,6 +5416,8 @@ AC_CONFIG_FILES([
- 	bin/named/unix/Makefile
- 	bin/named-pkcs11/Makefile
- 	bin/named-pkcs11/unix/Makefile
-+	bin/named-sdb/Makefile
-+	bin/named-sdb/unix/Makefile
- 	bin/nsupdate/Makefile
- 	bin/pkcs11/Makefile
- 	bin/python/Makefile
-@@ -5440,6 +5442,7 @@ AC_CONFIG_FILES([
- 	bin/python/isc/tests/dnskey_test.py
- 	bin/python/isc/tests/policy_test.py
- 	bin/rndc/Makefile
-+	bin/sdb_tools/Makefile
- 	bin/tests/Makefile
- 	bin/tests/headerdep_test.sh
- 	bin/tests/optional/Makefile
diff --git a/bind-9.3.1rc1-sdb_tools-Makefile.in b/bind-9.3.1rc1-sdb_tools-Makefile.in
deleted file mode 100644
index c7e0868..0000000
--- a/bind-9.3.1rc1-sdb_tools-Makefile.in
+++ /dev/null
@@ -1,63 +0,0 @@
-srcdir     =	@srcdir@
-VPATH      =	@srcdir@
-top_srcdir =	@top_srcdir@
-
-VERSION=@BIND9_VERSION@
-
-@BIND9_MAKE_INCLUDES@
-
-CINCLUDES =	-I${srcdir}/include -I${srcdir}/unix/include \
-		${LWRES_INCLUDES} ${DNS_INCLUDES} ${BIND9_INCLUDES} \
-		${ISCCFG_INCLUDES} ${ISCCC_INCLUDES} ${ISC_INCLUDES}
-
-CDEFINES =	-DBIND9
-
-DNSLIBS =	../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@
-ISCCFGLIBS =	../../lib/isccfg/libisccfg.@A@
-ISCCCLIBS =	../../lib/isccc/libisccc.@A@
-ISCLIBS =	../../lib/isc/libisc.@A@
-LWRESLIBS =	../../lib/lwres/liblwres.@A@
-BIND9LIBS =	../../lib/bind9/libbind9.@A@
-
-DNSDEPLIBS =	../../lib/dns/libdns.@A@
-ISCCFGDEPLIBS =	../../lib/isccfg/libisccfg.@A@
-ISCCCDEPLIBS =	../../lib/isccc/libisccc.@A@
-ISCDEPLIBS =	../../lib/isc/libisc.@A@
-LWRESDEPLIBS =	../../lib/lwres/liblwres.@A@
-BIND9DEPLIBS =	../../lib/bind9/libbind9.@A@
-
-DEPLIBS =	${LWRESDEPLIBS} ${DNSDEPLIBS} ${BIND9DEPLIBS} \
-		${ISCCFGDEPLIBS} ${ISCCCDEPLIBS} ${ISCDEPLIBS}
-
-LIBS =		${LWRESLIBS} ${DNSLIBS} ${BIND9LIBS} \
-		${ISCCFGLIBS} ${ISCCCLIBS} ${ISCLIBS} ${DBDRIVER_LIBS} @LIBS@
-
-TARGETS =	zone2ldap@EXEEXT@ zonetodb@EXEEXT@
-
-OBJS	=	zone2ldap.@O@ zonetodb.@O@
-
-SRCS    =       zone2ldap.c zonetodb.c
-
-MANPAGES =      zone2ldap.1
-
-EXT_CFLAGS =
-
-@BIND9_MAKE_RULES@
-
-zone2ldap@EXEEXT@: zone2ldap.@O@ ${DEPLIBS}
-	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ zone2ldap.@O@ -lldap -llber ${LIBS}
-
-zonetodb@EXEEXT@: zonetodb.@O@  ${DEPLIBS}
-	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ zonetodb.@O@ -lpq ${LIBS}
-
-clean distclean manclean maintainer-clean::
-	rm -f ${TARGETS} ${OBJS}
-
-installdirs:
-	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${sbindir}
-	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${mandir}/man1
-
-install:: ${TARGETS} installdirs
-	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} zone2ldap@EXEEXT@ ${DESTDIR}${sbindir}
-	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} zonetodb@EXEEXT@  ${DESTDIR}${sbindir}
-	${INSTALL_DATA} ${srcdir}/zone2ldap.1 ${DESTDIR}${mandir}/man1/zone2ldap.1
diff --git a/bind-9.3.2b1-fix_sdb_ldap.patch b/bind-9.3.2b1-fix_sdb_ldap.patch
deleted file mode 100644
index 35c8542..0000000
--- a/bind-9.3.2b1-fix_sdb_ldap.patch
+++ /dev/null
@@ -1,519 +0,0 @@
-diff --git a/bin/sdb_tools/Makefile.in b/bin/sdb_tools/Makefile.in
-index 95ab742..6069f09 100644
---- a/bin/sdb_tools/Makefile.in
-+++ b/bin/sdb_tools/Makefile.in
-@@ -32,11 +32,11 @@ DEPLIBS =	${LWRESDEPLIBS} ${DNSDEPLIBS} ${BIND9DEPLIBS} \
- LIBS =		${LWRESLIBS} ${DNSLIBS} ${BIND9LIBS} \
- 		${ISCCFGLIBS} ${ISCCCLIBS} ${ISCLIBS} ${DBDRIVER_LIBS} @LIBS@
- 
--TARGETS =	zone2ldap@EXEEXT@ zonetodb@EXEEXT@ zone2sqlite@EXEEXT@
-+TARGETS =	zone2ldap@EXEEXT@ ldap2zone@EXEEXT@ zonetodb@EXEEXT@ zone2sqlite@EXEEXT@
- 
--OBJS	=	zone2ldap.@O@ zonetodb.@O@ zone2sqlite.@O@
-+OBJS	=	zone2ldap.@O@ ldap2zone.@O@ zonetodb.@O@ zone2sqlite.@O@
- 
--SRCS    =       zone2ldap.c zonetodb.c zone2sqlite.c
-+SRCS    =       zone2ldap.c ldap2zone.c zonetodb.c zone2sqlite.c
- 
- MANPAGES =      zone2ldap.1
- 
-@@ -53,6 +53,9 @@ zonetodb@EXEEXT@: zonetodb.@O@  ${DEPLIBS}
- zone2sqlite@EXEEXT@: zone2sqlite.@O@  ${DEPLIBS}
- 	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${ALL_CFLAGS} ${LDFLAGS} -o $@ zone2sqlite.@O@ -lsqlite3 -lssl ${LIBS}
- 
-+ldap2zone@EXEEXT@: ldap2zone.@O@ ${DEPLIBS}
-+	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${ALL_CFLAGS} ${LDFLAGS} -o $@ ldap2zone.@O@ -lldap -llber ${LIBS}
-+
- clean distclean manclean maintainer-clean::
- 	rm -f ${TARGETS} ${OBJS}
- 
-@@ -62,6 +65,7 @@ installdirs:
- 
- install:: ${TARGETS} installdirs
- 	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} zone2ldap@EXEEXT@ ${DESTDIR}${sbindir}
-+	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} ldap2zone@EXEEXT@ ${DESTDIR}${sbindir}
- 	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} zonetodb@EXEEXT@  ${DESTDIR}${sbindir}
- 	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} zone2sqlite@EXEEXT@ ${DESTDIR}${sbindir}
- 	${INSTALL_DATA} ${srcdir}/zone2ldap.1 ${DESTDIR}${mandir}/man1/zone2ldap.1
-diff --git a/bin/sdb_tools/zone2ldap.c b/bin/sdb_tools/zone2ldap.c
-index aa2c711..76186b5 100644
---- a/bin/sdb_tools/zone2ldap.c
-+++ b/bin/sdb_tools/zone2ldap.c
-@@ -66,6 +66,9 @@ ldap_info;
- /* usage Info */
- void usage (void);
- 
-+/* Check for existence of (and possibly add) containing dNSZone objects */
-+int lookup_dns_zones( ldap_info *ldinfo);
-+
- /* Add to the ldap dit */
- void add_ldap_values (ldap_info * ldinfo);
- 
-@@ -82,7 +85,7 @@ char **hostname_to_dn_list (char *hostname, char *zone, unsigned int flags);
- int get_attr_list_size (char **tmp);
- 
- /* Get a DN */
--char *build_dn_from_dc_list (char **dc_list, unsigned int ttl, int flag);
-+char *build_dn_from_dc_list (char **dc_list, unsigned int ttl, int flag, char *zone);
- 
- /* Add to RR list */
- void add_to_rr_list (char *dn, char *name, char *type, char *data,
-@@ -104,11 +107,27 @@ void
- init_ldap_conn ();
- void usage();
- 
--char *argzone, *ldapbase, *binddn, *bindpw = NULL;
--const char *ldapsystem = "localhost";
--static const char *objectClasses[] =
--  { "top", "dNSZone", NULL };
--static const char *topObjectClasses[] = { "top", NULL };
-+static char *argzone, *ldapbase, *binddn, *bindpw = NULL;
-+
-+/* these are needed to placate gcc4's const-ness const-ernations : */
-+static char localhost[] = "localhost";
-+static char *ldapsystem=&(localhost[0]);
-+/* dnszone schema class names: */
-+static char topClass    [] ="top";
-+static char dNSZoneClass[] ="dNSZone";
-+static char objectClass [] ="objectClass";
-+static char dcObjectClass[]="dcObject";
-+/* dnszone schema attribute names: */
-+static char relativeDomainName[]="relativeDomainName";
-+static char dNSTTL            []="dNSTTL";
-+static char zoneName          []="zoneName";
-+static char dc                []="dc";
-+static char sameZone          []="@";
-+/* LDAPMod mod_values: */
-+static char *objectClasses    []= { &(topClass[0]), &(dNSZoneClass[0]), NULL };
-+static char *topObjectClasses []= { &(topClass[0]), &(dcObjectClass[0]), &(dNSZoneClass[0]), NULL };
-+static char *dn_buffer      [64]={NULL};
-+
- LDAP *conn;
- unsigned int debug = 0;
- 
-@@ -132,12 +151,12 @@ main (int argc, char **argv)
-   isc_result_t result;
-   char *basedn;
-   ldap_info *tmp;
--  LDAPMod *base_attrs[2];
--  LDAPMod base;
-+  LDAPMod *base_attrs[5];
-+  LDAPMod base, dcBase, znBase, rdnBase;
-   isc_buffer_t buff;
-   char *zonefile=0L;
-   char fullbasedn[1024];
--  char *ctmp;
-+  char *ctmp, *zn, *dcp[2], *znp[2], *rdn[2];
-   dns_fixedname_t fixedzone, fixedname;
-   dns_rdataset_t rdataset;
-   char **dc_list;
-@@ -150,7 +169,7 @@ main (int argc, char **argv)
-   extern char *optarg;
-   extern int optind, opterr, optopt;
-   int create_base = 0;
--  int topt;
-+  int topt, dcn, zdn, znlen;
- 
-   if (argc < 2)
-     {
-@@ -158,7 +177,7 @@ main (int argc, char **argv)
-       exit (-1);
-     }
- 
--  while ((topt = getopt (argc, argv, "D:w:b:z:f:h:?dcv")) != -1)
-+  while ((topt = getopt (argc, argv, "D:Ww:b:z:f:h:?dcv")) != -1)
-     {
-       switch (topt)
- 	{
-@@ -181,6 +200,9 @@ main (int argc, char **argv)
- 	  if (bindpw == NULL)
- 	    fatal("strdup");
- 	  break;
-+	case 'W':
-+	  bindpw = getpass("Enter LDAP Password: ");
-+	  break;
- 	case 'b':
- 	  ldapbase = strdup (optarg);
- 	  if (ldapbase == NULL)
-@@ -300,27 +322,62 @@ main (int argc, char **argv)
-     {
-       if (debug)
- 	printf ("Creating base zone DN %s\n", argzone);
--
-+      
-       dc_list = hostname_to_dn_list (argzone, argzone, DNS_TOP);
--      basedn = build_dn_from_dc_list (dc_list, 0, NO_SPEC);
- 
--      for (ctmp = &basedn[strlen (basedn)]; ctmp >= &basedn[0]; ctmp--)
-+      basedn = build_dn_from_dc_list (dc_list, 0, NO_SPEC, argzone);
-+      if (debug)
-+	printf ("base DN %s\n", basedn);
-+
-+      for (ctmp = &basedn[strlen (basedn)], dcn=0; ctmp >= &basedn[0]; ctmp--)
- 	{
--	  if ((*ctmp == ',') || (ctmp == &basedn[0]))
-+	    if ((*ctmp == ',') || (ctmp == &basedn[0]))
- 	    {
-+
- 	      base.mod_op = LDAP_MOD_ADD;
--	      base.mod_type = (char*)"objectClass";
--	      base.mod_values = (char**)topObjectClasses;
-+	      base.mod_type = objectClass;
-+	      base.mod_values = topObjectClasses;
- 	      base_attrs[0] = (void*)&base;
--	      base_attrs[1] = NULL;
--
-+	     
-+	      dcBase.mod_op = LDAP_MOD_ADD;
-+	      dcBase.mod_type = dc;
-+	      dcp[0]=dc_list[dcn];
-+	      dcp[1]=0L;
-+	      dcBase.mod_values=dcp;
-+	      base_attrs[1] = (void*)&dcBase;
-+
-+	      znBase.mod_op = LDAP_MOD_ADD;
-+	      znBase.mod_type = zoneName;	      
-+	      for( zdn = dcn, znlen = 0; zdn >= 0; zdn-- )
-+		  znlen += strlen(dc_list[zdn])+1;
-+	      znp[0] = (char*)malloc(znlen+1);
-+	      znp[1] = 0L;
-+	      for( zdn = dcn, zn=znp[0]; zdn >= 0; zdn-- )		  
-+		  zn+=sprintf(zn,"%s%s",dc_list[zdn], 
-+			      ((zdn > 0) && (*(dc_list[zdn-1])!='.')) ? "." : ""
-+		             );
-+
-+	      znBase.mod_values = znp;
-+	      base_attrs[2] = (void*)&znBase;
-+
-+	      rdnBase.mod_op = LDAP_MOD_ADD;
-+	      rdnBase.mod_type = relativeDomainName;
-+	      rdn[0] = strdup(sameZone);
-+	      rdn[1] = 0L;
-+	      rdnBase.mod_values = rdn;
-+	      base_attrs[3] = (void*)&rdnBase;
-+	      
-+	      dcn++;
-+
-+	      base.mod_values = topObjectClasses;
-+	      base_attrs[4] = NULL;	      
-+	      
- 	      if (ldapbase)
- 		{
- 		  if (ctmp != &basedn[0])
- 		    sprintf (fullbasedn, "%s,%s", ctmp + 1, ldapbase);
- 		  else
--		    sprintf (fullbasedn, "%s,%s", ctmp, ldapbase);
--
-+		    sprintf (fullbasedn, "%s,%s", ctmp, ldapbase);		  
- 		}
- 	      else
- 		{
-@@ -329,8 +386,13 @@ main (int argc, char **argv)
- 		  else
- 		    sprintf (fullbasedn, "%s", ctmp);
- 		}
-+
-+	      if( debug )
-+		  printf("Full base dn: %s\n", fullbasedn);
-+
- 	      result = ldap_add_s (conn, fullbasedn, base_attrs);
- 	      ldap_result_check ("intial ldap_add_s", fullbasedn, result);
-+
- 	    }
- 
- 	}
-@@ -408,14 +470,14 @@ generate_ldap (dns_name_t * dnsname, dns_rdata_t * rdata, unsigned int ttl)
-   isc_result_check (result, "dns_rdata_totext");
-   data[isc_buffer_usedlength (&buff)] = 0;
- 
--  dc_list = hostname_to_dn_list (name, argzone, DNS_OBJECT);
-+  dc_list = hostname_to_dn_list ((char*)name, argzone, DNS_OBJECT);
-   len = (get_attr_list_size (dc_list) - 2);
--  dn = build_dn_from_dc_list (dc_list, ttl, WI_SPEC);
-+  dn = build_dn_from_dc_list (dc_list, ttl, WI_SPEC, argzone);
- 
-   if (debug)
-     printf ("Adding %s (%s %s) to run queue list.\n", dn, type, data);
- 
--  add_to_rr_list (dn, dc_list[len], type, data, ttl, DNS_OBJECT);
-+  add_to_rr_list (dn, dc_list[len], (char*)type, (char*)data, ttl, DNS_OBJECT);
- }
- 
- 
-@@ -455,7 +517,8 @@ add_to_rr_list (char *dn, char *name, char *type,
-   int attrlist;
-   char ldap_type_buffer[128];
-   char charttl[64];
--
-+  char *zn;
-+  int znlen;
- 
-   if ((tmp = locate_by_dn (dn)) == NULL)
-     {
-@@ -482,13 +545,13 @@ add_to_rr_list (char *dn, char *name, char *type,
- 	    fatal("malloc");
- 	}
-       tmp->attrs[0]->mod_op = LDAP_MOD_ADD;
--      tmp->attrs[0]->mod_type = (char*)"objectClass";
-+      tmp->attrs[0]->mod_type = objectClass;
- 
-       if (flags == DNS_OBJECT)
--	tmp->attrs[0]->mod_values = (char**)objectClasses;
-+	tmp->attrs[0]->mod_values = objectClasses;
-       else
- 	{
--	  tmp->attrs[0]->mod_values = (char**)topObjectClasses;
-+	  tmp->attrs[0]->mod_values =topObjectClasses;
- 	  tmp->attrs[1] = NULL;
- 	  tmp->attrcnt = 2;
- 	  tmp->next = ldap_info_base;
-@@ -497,7 +560,7 @@ add_to_rr_list (char *dn, char *name, char *type,
- 	}
- 
-       tmp->attrs[1]->mod_op = LDAP_MOD_ADD;
--      tmp->attrs[1]->mod_type = (char*)"relativeDomainName";
-+      tmp->attrs[1]->mod_type = relativeDomainName;
-       tmp->attrs[1]->mod_values = (char **) calloc (sizeof (char *), 2);
- 
-       if (tmp->attrs[1]->mod_values == (char **)NULL)
-@@ -526,7 +589,7 @@ add_to_rr_list (char *dn, char *name, char *type,
- 	 fatal("strdup");
- 
-       tmp->attrs[3]->mod_op = LDAP_MOD_ADD;
--      tmp->attrs[3]->mod_type = (char*)"dNSTTL";
-+      tmp->attrs[3]->mod_type = dNSTTL;
-       tmp->attrs[3]->mod_values = (char **) calloc (sizeof (char *), 2);
- 
-       if (tmp->attrs[3]->mod_values == (char **)NULL)
-@@ -539,14 +602,25 @@ add_to_rr_list (char *dn, char *name, char *type,
-       if (tmp->attrs[3]->mod_values[0] == NULL)
- 	 fatal("strdup");
- 
-+      znlen=strlen(gbl_zone);      
-+      if ( *(gbl_zone + (znlen-1)) == '.' )
-+      { /* ldapdb MUST search by relative zone name */
-+	  zn = (char*)malloc(znlen);
-+	  strncpy(zn,gbl_zone,znlen-1);
-+	  *(zn + (znlen-1))='\0';	  
-+      }else
-+      {
-+	  zn = gbl_zone;
-+      }
-+
-       tmp->attrs[4]->mod_op = LDAP_MOD_ADD;
--      tmp->attrs[4]->mod_type = (char*)"zoneName";
-+      tmp->attrs[4]->mod_type = zoneName;
-       tmp->attrs[4]->mod_values = (char **)calloc(sizeof(char *), 2);
- 
-       if (tmp->attrs[4]->mod_values == (char **)NULL)
- 	 fatal("calloc");
- 
--      tmp->attrs[4]->mod_values[0] = gbl_zone;
-+      tmp->attrs[4]->mod_values[0] = zn;
-       tmp->attrs[4]->mod_values[1] = NULL;
- 
-       tmp->attrs[5] = NULL;
-@@ -557,7 +631,7 @@ add_to_rr_list (char *dn, char *name, char *type,
-   else
-     {
- 
--      for (i = 0; tmp->attrs[i] != NULL; i++)
-+	for (i = 0; tmp->attrs[i] != NULL; i++)
- 	{
- 	  sprintf (ldap_type_buffer, "%sRecord", type);
- 	  if (!strncmp
-@@ -631,44 +705,70 @@ char **
- hostname_to_dn_list (char *hostname, char *zone, unsigned int flags)
- {
-   char *tmp;
--  static char *dn_buffer[64];
-   int i = 0;
--  char *zname;
--  char *hnamebuff;
--
--  zname = strdup (hostname);
--  if (zname == NULL)
--	fatal("strdup");
--
--  if (flags == DNS_OBJECT)
--    {
--
--      if (strlen (zname) != strlen (zone))
--	{
--	  tmp = &zname[strlen (zname) - strlen (zone)];
--	  *--tmp = '\0';
--	  hnamebuff = strdup (zname);
--	  if (hnamebuff == NULL)
--		fatal("strdup");
--	  zname = ++tmp;
--	}
--      else
--	hnamebuff = (char*)"@";
--    }
--  else
--    {
--      zname = zone;
--      hnamebuff = NULL;
--    }
--
--  for (tmp = strrchr (zname, '.'); tmp != (char *) 0;
--       tmp = strrchr (zname, '.'))
--    {
--      *tmp++ = '\0';
--      dn_buffer[i++] = tmp;
--    }
--  dn_buffer[i++] = zname;
--  dn_buffer[i++] = hnamebuff;
-+  char *hname=0L, *last=0L;
-+  int hlen=strlen(hostname), zlen=(strlen(zone));
-+
-+/*  printf("hostname: %s zone: %s\n",hostname, zone); */
-+  hname=0L;
-+  if(flags == DNS_OBJECT)
-+  {
-+      if( (zone[ zlen - 1 ] == '.') && (hostname[hlen - 1] != '.') )
-+      {
-+	  hname=(char*)malloc(hlen + 1);
-+	  hlen += 1;
-+	  sprintf(hname, "%s.", hostname);
-+	  hostname = hname;
-+      }
-+      if(strcmp(hostname, zone) == 0)
-+      {
-+	  if( hname == 0 )
-+	      hname=strdup(hostname);
-+  	  last = strdup(sameZone);
-+      }else
-+      {	   
-+	  if(  (hlen < zlen) 
-+	     ||( strcmp( hostname + (hlen - zlen), zone ) != 0)
-+	    )
-+	  {
-+	      if( hname != 0 )
-+		  free(hname);
-+	      hname=(char*)malloc( hlen + zlen + 1);
-+	      if( *zone == '.' )
-+		  sprintf(hname, "%s%s", hostname, zone);
-+	      else
-+		  sprintf(hname,"%s",zone);
-+	  }else
-+	  {
-+	      if( hname == 0 )
-+		  hname = strdup(hostname);
-+	  }
-+	  last = hname;
-+      }
-+  }else
-+  { /* flags == DNS_TOP */
-+      hname = strdup(zone);
-+      last = hname;
-+  }
-+
-+  for (tmp = strrchr (hname, '.'); tmp != (char *) 0;
-+       tmp = strrchr (hname, '.'))
-+  {
-+      if( *( tmp + 1 ) != '\0' )
-+      {
-+	  *tmp = '\0';
-+	  dn_buffer[i++] = ++tmp;
-+      }else
-+      { /* trailing '.' ! */
-+	  dn_buffer[i++] = strdup(".");
-+	  *tmp = '\0';
-+	  if( tmp == hname )
-+	      break;
-+      }	  
-+  }
-+  if( ( last != hname ) && (tmp != hname) )
-+      dn_buffer[i++] = hname;
-+  dn_buffer[i++] = last;
-   dn_buffer[i] = NULL;
- 
-   return dn_buffer;
-@@ -680,24 +780,32 @@ hostname_to_dn_list (char *hostname, char *zone, unsigned int flags)
-  * exception of "@"/SOA. */
- 
- char *
--build_dn_from_dc_list (char **dc_list, unsigned int ttl, int flag)
-+build_dn_from_dc_list (char **dc_list, unsigned int ttl, int flag, char *zone)
- {
-   int size;
--  int x;
-+  int x, znlen;
-   static char dn[1024];
-   char tmp[128];
-+  char zn[DNS_NAME_MAXTEXT+1];
- 
-   bzero (tmp, sizeof (tmp));
-   bzero (dn, sizeof (dn));
-   size = get_attr_list_size (dc_list);
-+  znlen = strlen(zone);
-+  if ( *(zone + (znlen-1)) == '.' )
-+  { /* ldapdb MUST search by relative zone name */
-+      memcpy(&(zn[0]),zone,znlen-1);
-+      *(zn + (znlen-1))='\0';
-+      zone = zn;
-+  }
-   for (x = size - 2; x > 0; x--)
-     {
-     if (flag == WI_SPEC)
-     {
-       if (x == (size - 2) && (strncmp (dc_list[x], "@", 1) == 0) && (ttl))
--	sprintf (tmp, "relativeDomainName=%s + dNSTTL=%u,", dc_list[x], ttl);
-+	sprintf (tmp, "zoneName=%s + relativeDomainName=%s,", zone, dc_list[x]);
-       else if (x == (size - 2))
--	      sprintf(tmp, "relativeDomainName=%s,",dc_list[x]);
-+	      sprintf(tmp, "zoneName=%s + relativeDomainName=%s,", zone, dc_list[x]);
-       else
- 	      sprintf(tmp,"dc=%s,", dc_list[x]);
-     }
-@@ -723,6 +831,7 @@ void
- init_ldap_conn ()
- {
-   int result;
-+  char ldb_tag[]="LDAP Bind";
-   conn = ldap_open (ldapsystem, LDAP_PORT);
-   if (conn == NULL)
-     {
-@@ -732,7 +841,7 @@ init_ldap_conn ()
-     }
- 
-   result = ldap_simple_bind_s (conn, binddn, bindpw);
--  ldap_result_check ("ldap_simple_bind_s", (char*)"LDAP Bind", result);
-+  ldap_result_check ("ldap_simple_bind_s", ldb_tag , result);
- }
- 
- /* Like isc_result_check, only for LDAP */
-@@ -749,8 +858,6 @@ ldap_result_check (const char *msg, char *dn, int err)
-     }
- }
- 
--
--
- /* For running the ldap_info run queue. */
- void
- add_ldap_values (ldap_info * ldinfo)
-@@ -758,14 +865,14 @@ add_ldap_values (ldap_info * ldinfo)
-   int result;
-   char dnbuffer[1024];
- 
--
-   if (ldapbase != NULL)
-     sprintf (dnbuffer, "%s,%s", ldinfo->dn, ldapbase);
-   else
-     sprintf (dnbuffer, "%s", ldinfo->dn);
- 
-   result = ldap_add_s (conn, dnbuffer, ldinfo->attrs);
--  ldap_result_check ("ldap_add_s", dnbuffer, result);
-+    ldap_result_check ("ldap_add_s", dnbuffer, result);
-+
- }
- 
- 
-@@ -776,5 +883,5 @@ void
- usage ()
- {
-   fprintf (stderr,
--	   "zone2ldap -D [BIND DN] -w [BIND PASSWORD] -b [BASE DN] -z [ZONE] -f [ZONE FILE] -h [LDAP HOST] "
-+	   "zone2ldap -D [BIND DN] [-w BIND PASSWORD | -W:prompt] -b [BASE DN] -z [ZONE] -f [ZONE FILE] -h [LDAP HOST] "
- 	   "[-c Create LDAP Base structure][-d Debug Output (lots !)] \n ");}
diff --git a/bind.spec b/bind.spec
index a95a4cf..1b5b869 100644
--- a/bind.spec
+++ b/bind.spec
@@ -10,9 +10,6 @@
 # bcond_without is built by default, unless --without X is passed
 # bcond_with is built only when --with X is passed to build
 %bcond_with    SYSTEMTEST
-# TODO: sdb tools from contrib were removed.
-# Disable SDB for now
-%bcond_with SDB
 %bcond_without GSSTSIG
 # it is not possible to build the package without PKCS11 sub-package
 # due to extensive changes to Makefiles
@@ -21,7 +18,6 @@
 %bcond_without LMDB
 %bcond_without JSON
 %bcond_without DNSTAP
-# TODO: mysql is not well suported without SDB.
 %bcond_with    BDB
 # skip DLZ for now
 %bcond_without DLZ
@@ -38,9 +34,6 @@
 %{?!bind_gid:  %global bind_gid  25}
 %global        bind_dir          /var/named
 %global        chroot_prefix     %{bind_dir}/chroot
-%if %{with SDB}
-%global        chroot_sdb_prefix %{bind_dir}/chroot_sdb
-%endif
 %global        chroot_create_directories /dev /run/named %{_localstatedir}/{log,named,tmp} \\\
                                          %{_sysconfdir}/{crypto-policies/back-ends,pki/dnssec-keys,named} \\\
                                          %{_libdir}/bind %{_datadir}/GeoIP
@@ -77,9 +70,6 @@ Source1:  named.sysconfig
 Source2:  https://ftp.isc.org/isc/bind9/%{BINDVERSION}/bind-%{BINDVERSION}.tar.xz.asc
 Source3:  named.logrotate
 Source4:  https://downloads.isc.org/isc/pgpkeys/codesign2019.txt
-Source7:  bind-9.3.1rc1-sdb_tools-Makefile.in
-Source8:  dnszone.schema
-Source12: README.sdb_pgsql
 Source16: named.conf
 # Refresh by command: dig @a.root-servers.net. +tcp +norec
 # or from URL
@@ -90,22 +80,14 @@ Source20: named.empty
 Source23: named.rfc1912.zones
 Source25: named.conf.sample
 Source27: named.root.key
-Source30: ldap2zone.c
-Source31: ldap2zone.1
-Source32: named-sdb.8
-Source33: zonetodb.1
-Source34: zone2sqlite.1
 Source35: bind.tmpfiles.d
 Source36: trusted-key.key
 Source37: named.service
 Source38: named-chroot.service
-Source39: named-sdb.service
-Source40: named-sdb-chroot.service
 Source41: setup-named-chroot.sh
 Source42: generate-rndc-key.sh
 Source43: named.rwtab
 Source44: named-chroot-setup.service
-Source45: named-sdb-chroot-setup.service
 Source46: named-setup-rndc.service
 Source47: named-pkcs11.service
 Source48: setup-named-softhsm.sh
@@ -140,12 +122,6 @@ Patch171:bind-9.11-tests-variants.patch
 Patch172:bind-9.11-tests-pkcs11.patch
 Patch173:bind-9.16-libisc-link.patch
 
-# SDB patches
-Patch12: bind-9.10-sdb.patch
-
-# needs inpection
-Patch17: bind-9.3.2b1-fix_sdb_ldap.patch
-
 Requires(post):   systemd
 Requires(preun):  systemd
 Requires(postun): systemd
@@ -268,25 +244,6 @@ This a set of development files for BIND libraries (dns, isc) compiled
 with native PKCS#11 functionality.
 %endif
 
-%if %{with SDB}
-%package sdb
-Summary: BIND server with database backends and DLZ support
-Requires: systemd
-Requires: bind%{?_isa} = %{epoch}:%{version}-%{release}
-Requires: bind-libs%{?_isa} = %{epoch}:%{version}-%{release}
-Requires: bind-libs-lite%{?_isa} = %{epoch}:%{version}-%{release}
-
-%description sdb
-BIND (Berkeley Internet Name Domain) is an implementation of the DNS
-(Domain Name System) protocols. BIND includes a DNS server (named-sdb)
-which has compiled-in SDB (Simplified Database Backend) which includes
-support for using alternative Zone Databases stored in an LDAP server
-(ldapdb), a postgreSQL database (pgsqldb), an sqlite database (sqlitedb),
-or in the filesystem (dirdb), in addition to the standard in-memory RBT
-(Red Black Tree) zone database. It also includes support for DLZ
-(Dynamic Loadable Zones)
-%endif
-
 %package libs-lite
 Summary:  Libraries for working with the DNS protocol
 Obsoletes:bind-libbind-devel < 31:9.3.3-4.fc7
@@ -393,20 +350,6 @@ This package contains a tree of files which can be used as a
 chroot(2) jail for the named(8) program from the BIND package.
 Based on the code from Jan "Yenya" Kasprzak <kas@fi.muni.cz>
 
-%if %{with SDB}
-%package sdb-chroot
-Summary:        A chroot runtime environment for the ISC BIND DNS server, named-sdb(8)
-Prefix:         %{chroot_sdb_prefix}
-# grep is required due to setup-named-chroot.sh script
-Requires:       grep
-Requires:       bind-sdb%{?_isa} = %{epoch}:%{version}-%{release}
-
-%description sdb-chroot
-This package contains a tree of files which can be used as a
-chroot(2) jail for the named-sdb(8) program from the BIND package.
-Based on the code from Jan "Yenya" Kasprzak <kas@fi.muni.cz>
-%endif
-
 
 %if %{with DLZ}
 %if %{with BDB}
@@ -500,32 +443,6 @@ cp -r lib/ns{,-pkcs11}
 %patch150 -p1 -b .engine-pkcs11
 %endif
 
-%if %{with SDB}
-mkdir bin/named-sdb
-cp -r bin/named/* bin/named-sdb
-# SDB ldap
-cp -fp contrib/sdb/ldap/ldapdb.[ch] bin/named-sdb
-# SDB postgreSQL
-cp -fp contrib/sdb/pgsql/pgsqldb.[ch] bin/named-sdb
-# SDB sqlite
-cp -fp contrib/sdb/sqlite/sqlitedb.[ch] bin/named-sdb
-# SDB Berkeley DB - needs to be ported to DB4!
-#cp -fp contrib/sdb/bdb/bdb.[ch] bin/named_sdb
-# SDB dir
-cp -fp contrib/sdb/dir/dirdb.[ch] bin/named-sdb
-# SDB tools
-mkdir -p bin/sdb_tools
-cp -fp %{SOURCE30} bin/sdb_tools/ldap2zone.c
-cp -fp %{SOURCE7} bin/sdb_tools/Makefile.in
-#cp -fp contrib/sdb/bdb/zone2bdb.c bin/sdb_tools
-cp -fp contrib/sdb/ldap/{zone2ldap.1,zone2ldap.c} bin/sdb_tools
-cp -fp contrib/sdb/pgsql/zonetodb.c bin/sdb_tools
-cp -fp contrib/sdb/sqlite/zone2sqlite.c bin/sdb_tools
-%patch12 -p1 -b .sdb
-%patch17 -p1 -b .fix_sdb_ldap
-%patch137 -p1 -b .strlcat_fix
-%endif
-
 %patch133 -p1 -b .rh640538
 #%patch134 -p1 -b .rh669163
 
@@ -534,11 +451,6 @@ cp -fp contrib/sdb/sqlite/zone2sqlite.c bin/sdb_tools
 for i in bin/named/{,unix}/Makefile.in; do
   sed -i 's|fpie|fPIE|g' $i
 done
-%if %{with SDB}
-for i in bin/named-sdb/{,unix}/Makefile.in; do
-  sed -i 's|fpie|fPIE|g' $i
-done
-%endif
 %endif
 :;
 
@@ -601,7 +513,7 @@ export LIBDIR_SUFFIX
   --with-pkcs11=%{_libdir}/pkcs11/libsofthsm2.so \
 %endif
   --with-dlopen=yes \
-%if %{with SDB} || %{with DLZ}
+%if %{with DLZ}
   --with-dlz-ldap=yes \
   --with-dlz-postgres=yes \
   --with-dlz-mysql=yes \
@@ -756,23 +668,6 @@ popd
 touch ${RPM_BUILD_ROOT}/%{chroot_prefix}%{_sysconfdir}/named.conf
 #end chroot
 
-#sdb-chroot
-%if %{with SDB}
-for D in %{chroot_create_directories}
-do
-  mkdir -p ${RPM_BUILD_ROOT}/%{chroot_sdb_prefix}${D}
-done
-
-# create symlink as it is on real filesystem
-pushd ${RPM_BUILD_ROOT}/%{chroot_sdb_prefix}%{_localstatedir}
-ln -s ../run run
-popd
-
-# these are required to prevent them being erased during upgrade of previous
-touch ${RPM_BUILD_ROOT}/%{chroot_sdb_prefix}%{_sysconfdir}/named.conf
-%endif
-#end sdb-chroot
-
 pushd build
 make DESTDIR=${RPM_BUILD_ROOT} install
 popd
@@ -787,12 +682,6 @@ install -m 644 %{SOURCE38} ${RPM_BUILD_ROOT}%{_unitdir}
 install -m 644 %{SOURCE44} ${RPM_BUILD_ROOT}%{_unitdir}
 install -m 644 %{SOURCE46} ${RPM_BUILD_ROOT}%{_unitdir}
 
-%if %{with SDB}
-install -m 644 %{SOURCE39} ${RPM_BUILD_ROOT}%{_unitdir}
-install -m 644 %{SOURCE40} ${RPM_BUILD_ROOT}%{_unitdir}
-install -m 644 %{SOURCE45} ${RPM_BUILD_ROOT}%{_unitdir}
-%endif
-
 %if %{with PKCS11}
 install -m 644 %{SOURCE47} ${RPM_BUILD_ROOT}%{_unitdir}
 %else
@@ -814,11 +703,6 @@ install -m 644 %SOURCE3 ${RPM_BUILD_ROOT}/etc/logrotate.d/named
 mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig
 install -m 644 %{SOURCE1} ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/named
 install -m 644 %{SOURCE49} ${RPM_BUILD_ROOT}%{_sysconfdir}/named-chroot.files
-%if %{with SDB}
-mkdir -p ${RPM_BUILD_ROOT}/etc/openldap/schema
-install -m 644 %{SOURCE8} ${RPM_BUILD_ROOT}/etc/openldap/schema/dnszone.schema
-install -m 644 %{SOURCE12} contrib/sdb/pgsql/
-%endif
 
 %if %{with DLZ}
   pushd build
@@ -859,14 +743,6 @@ rm -rf ${RPM_BUILD_ROOT}/%{_includedir}/bind9
 rm -f ${RPM_BUILD_ROOT}/%{_mandir}/man3/lwres*
 %endif
 
-# SDB manpages
-%if %{with SDB}
-install -m 644 %{SOURCE31} ${RPM_BUILD_ROOT}%{_mandir}/man1/ldap2zone.1
-install -m 644 %{SOURCE32} ${RPM_BUILD_ROOT}%{_mandir}/man8/named-sdb.8
-install -m 644 %{SOURCE33} ${RPM_BUILD_ROOT}%{_mandir}/man1/zonetodb.1
-install -m 644 %{SOURCE34} ${RPM_BUILD_ROOT}%{_mandir}/man1/zone2sqlite.1
-%endif
-
 # PKCS11 versions manpages
 %if %{with PKCS11}
 pushd ${RPM_BUILD_ROOT}%{_mandir}/man8
@@ -972,20 +848,6 @@ if [ -e "%{_sysconfdir}/selinux/config" ]; then
   %selinux_unset_booleans -s mls %{selinuxbooleans}
 fi
 
-%if %{with SDB}
-%post sdb
-# Initial installation 
-%systemd_post named-sdb.service
-
-%preun sdb
-# Package removal, not upgrade
-%systemd_preun named-sdb.service
-
-%postun sdb
-# Package upgrade, not uninstall
-%systemd_postun_with_restart named-sdb.service
-%endif
-
 %if %{with PKCS11}
 %post pkcs11
 # Initial installation
@@ -1051,29 +913,6 @@ fi;
 %systemd_postun_with_restart named-chroot.service
 
 
-%if %{with SDB}
-
-%post sdb-chroot
-%systemd_post named-sdb-chroot.service
-%chroot_fix_devices %{chroot_sdb_prefix}
-:;
-
-%posttrans sdb-chroot
-if [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled; then
-  [ -x /sbin/restorecon ] && /sbin/restorecon %{chroot_sdb_prefix}/dev/* > /dev/null 2>&1;
-fi;
-:;
-
-%preun sdb-chroot
-%systemd_preun named-sdb-chroot.service 
-:;
-
-%postun sdb-chroot
-# Package upgrade, not uninstall
-%systemd_postun_with_restart named-sdb-chroot.service
-
-%endif
-
 %files
 # TODO: Move from lib/bind to lib/named, as used by upstream
 %{_libdir}/bind
@@ -1131,24 +970,6 @@ fi;
 %defattr(-,named,named,-)
 %dir /run/named
 
-%if %{with SDB}
-%files sdb
-%{_unitdir}/named-sdb.service
-%{_mandir}/man1/zone2ldap.1*
-%{_mandir}/man1/ldap2zone.1*
-%{_mandir}/man1/zonetodb.1*
-%{_mandir}/man1/zone2sqlite.1*
-%{_mandir}/man8/named-sdb.8*
-%doc contrib/sdb/ldap/README.ldap contrib/sdb/ldap/INSTALL.ldap contrib/sdb/pgsql/README.sdb_pgsql
-%dir %{_sysconfdir}/openldap/schema
-%config(noreplace) %{_sysconfdir}/openldap/schema/dnszone.schema
-%{_sbindir}/named-sdb
-%{_sbindir}/zone2ldap
-%{_sbindir}/ldap2zone
-%{_sbindir}/zonetodb
-%{_sbindir}/zone2sqlite
-%endif
-
 %files libs
 %{_libdir}/libbind9.so.1600*
 %{_libdir}/libisccc.so.1600*
@@ -1266,44 +1087,6 @@ fi;
 %dir %{chroot_prefix}/run/named
 %{chroot_prefix}%{_localstatedir}/run
 
-%if %{with SDB}
-%files sdb-chroot
-%config(noreplace) %{_sysconfdir}/named-chroot.files
-%{_unitdir}/named-sdb-chroot.service
-%{_unitdir}/named-sdb-chroot-setup.service
-%{_libexecdir}/setup-named-chroot.sh
-%defattr(0664,root,named,-)
-%ghost %dev(c,1,3) %verify(not mtime) %{chroot_sdb_prefix}/dev/null
-%ghost %dev(c,1,8) %verify(not mtime) %{chroot_sdb_prefix}/dev/random
-%ghost %dev(c,1,9) %verify(not mtime) %{chroot_sdb_prefix}/dev/urandom
-%ghost %dev(c,1,5) %verify(not mtime) %{chroot_sdb_prefix}/dev/zero
-%defattr(0640,root,named,0750)
-%dir %{chroot_sdb_prefix}
-%dir %{chroot_sdb_prefix}/dev
-%dir %{chroot_sdb_prefix}%{_sysconfdir}
-%dir %{chroot_sdb_prefix}%{_sysconfdir}/named
-%dir %{chroot_sdb_prefix}%{_sysconfdir}/pki
-%dir %{chroot_sdb_prefix}%{_sysconfdir}/pki/dnssec-keys
-%dir %{chroot_sdb_prefix}%{_sysconfdir}/crypto-policies
-%dir %{chroot_sdb_prefix}%{_sysconfdir}/crypto-policies/back-ends
-%dir %{chroot_sdb_prefix}%{_localstatedir}
-%dir %{chroot_sdb_prefix}/run
-%ghost %config(noreplace) %{chroot_sdb_prefix}%{_sysconfdir}/named.conf
-%defattr(0660,root,named,01770)
-%dir %{chroot_sdb_prefix}%{_localstatedir}/named
-%defattr(-,root,root,-)
-%dir %{chroot_sdb_prefix}/usr
-%dir %{chroot_sdb_prefix}/%{_libdir}
-%dir %{chroot_sdb_prefix}/%{_libdir}/bind
-%dir %{chroot_sdb_prefix}/%{_datadir}/GeoIP
-%defattr(0660,named,named,0770)
-%dir %{chroot_sdb_prefix}%{_localstatedir}/tmp
-%dir %{chroot_sdb_prefix}%{_localstatedir}/log
-%defattr(-,named,named,-)
-%dir %{chroot_sdb_prefix}/run/named
-%{chroot_sdb_prefix}%{_localstatedir}/run
-%endif
-
 %if %{with PKCS11}
 %files pkcs11
 %{_sbindir}/named-pkcs11
@@ -1337,9 +1120,6 @@ fi;
 
 %if %{with DLZ} && %{with BDB}
 %files dlz-bdb
-%if %{with SDB}
-%{_sbindir}/dlzbdb
-%endif
 %{_libdir}/bind/dlz_bdbhpt_dynamic.so
 %doc contrib/dlz/modules/bdbhpt/testing/*
 %doc contrib/dlz/modules/bdbhpt/README*
diff --git a/dnszone.schema b/dnszone.schema
deleted file mode 100644
index cb72a3f..0000000
--- a/dnszone.schema
+++ /dev/null
@@ -1,148 +0,0 @@
-# A schema for storing DNS zones in LDAP
-#
-attributetype ( 1.3.6.1.4.1.2428.20.0.0  NAME 'dNSTTL'
-	DESC 'An integer denoting time to live'
-	EQUALITY integerMatch
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 )
-
-attributetype ( 1.3.6.1.4.1.2428.20.0.1 NAME 'dNSClass'
-	DESC 'The class of a resource record'
-	EQUALITY caseIgnoreIA5Match
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
-
-attributetype ( 1.3.6.1.4.1.2428.20.0.2 NAME 'zoneName'
-	DESC 'The name of a zone, i.e. the name of the highest node in the zone'
-	EQUALITY caseIgnoreIA5Match
-	SUBSTR caseIgnoreIA5SubstringsMatch
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
-
-attributetype ( 1.3.6.1.4.1.2428.20.0.3 NAME 'relativeDomainName'
-	DESC 'The starting labels of a domain name'
-	EQUALITY caseIgnoreIA5Match
-	SUBSTR caseIgnoreIA5SubstringsMatch
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
-
-attributetype ( 1.3.6.1.4.1.2428.20.1.12 NAME 'pTRRecord'
-	DESC 'domain name pointer, RFC 1035'
-	EQUALITY caseIgnoreIA5Match
-	SUBSTR caseIgnoreIA5SubstringsMatch
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
-
-attributetype ( 1.3.6.1.4.1.2428.20.1.13 NAME 'hInfoRecord'
-	DESC 'host information, RFC 1035'
-	EQUALITY caseIgnoreIA5Match
-	SUBSTR caseIgnoreIA5SubstringsMatch
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
-
-attributetype ( 1.3.6.1.4.1.2428.20.1.14 NAME 'mInfoRecord'
-	DESC 'mailbox or mail list information, RFC 1035'
-	EQUALITY caseIgnoreIA5Match
-	SUBSTR caseIgnoreIA5SubstringsMatch
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
-
-attributetype ( 1.3.6.1.4.1.2428.20.1.16 NAME 'tXTRecord'
-	DESC 'text string, RFC 1035'
-	EQUALITY caseIgnoreIA5Match
-	SUBSTR caseIgnoreIA5SubstringsMatch
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
-
-attributetype ( 1.3.6.1.4.1.2428.20.1.18 NAME 'aFSDBRecord'
-	DESC 'for AFS Data Base location, RFC 1183'
-	EQUALITY caseIgnoreIA5Match
-	SUBSTR caseIgnoreIA5SubstringsMatch
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
-
-attributetype ( 1.3.6.1.4.1.2428.20.1.24 NAME 'SigRecord'
-	DESC 'Signature, RFC 2535'
-	EQUALITY caseIgnoreIA5Match
-	SUBSTR caseIgnoreIA5SubstringsMatch
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
-
-attributetype ( 1.3.6.1.4.1.2428.20.1.25 NAME 'KeyRecord'
-	DESC 'Key, RFC 2535'
-	EQUALITY caseIgnoreIA5Match
-	SUBSTR caseIgnoreIA5SubstringsMatch
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
-
-attributetype ( 1.3.6.1.4.1.2428.20.1.28 NAME 'aAAARecord'
-	DESC 'IPv6 address, RFC 1886'
-	EQUALITY caseIgnoreIA5Match
-	SUBSTR caseIgnoreIA5SubstringsMatch
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
-
-attributetype ( 1.3.6.1.4.1.2428.20.1.29 NAME 'LocRecord'
-	DESC 'Location, RFC 1876'
-	EQUALITY caseIgnoreIA5Match
-	SUBSTR caseIgnoreIA5SubstringsMatch
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
-
-attributetype ( 1.3.6.1.4.1.2428.20.1.30 NAME 'nXTRecord'
-	DESC 'non-existant, RFC 2535'
-	EQUALITY caseIgnoreIA5Match
-	SUBSTR caseIgnoreIA5SubstringsMatch
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
-
-attributetype ( 1.3.6.1.4.1.2428.20.1.33 NAME 'sRVRecord'
-	DESC 'service location, RFC 2782'
-	EQUALITY caseIgnoreIA5Match
-	SUBSTR caseIgnoreIA5SubstringsMatch
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
-
-attributetype ( 1.3.6.1.4.1.2428.20.1.35 NAME 'nAPTRRecord'
-	DESC 'Naming Authority Pointer, RFC 2915'
-	EQUALITY caseIgnoreIA5Match
-	SUBSTR caseIgnoreIA5SubstringsMatch
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
-
-attributetype ( 1.3.6.1.4.1.2428.20.1.36 NAME 'kXRecord'
-	DESC 'Key Exchange Delegation, RFC 2230'
-	EQUALITY caseIgnoreIA5Match
-	SUBSTR caseIgnoreIA5SubstringsMatch
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
-
-attributetype ( 1.3.6.1.4.1.2428.20.1.37 NAME 'certRecord'
-	DESC 'certificate, RFC 2538'
-	EQUALITY caseIgnoreIA5Match
-	SUBSTR caseIgnoreIA5SubstringsMatch
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
-
-attributetype ( 1.3.6.1.4.1.2428.20.1.38 NAME 'a6Record'
-	DESC 'A6 Record Type, RFC 2874'
-	EQUALITY caseIgnoreIA5Match
-	SUBSTR caseIgnoreIA5SubstringsMatch
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
-
-attributetype ( 1.3.6.1.4.1.2428.20.1.39 NAME 'dNameRecord'
-	DESC 'Non-Terminal DNS Name Redirection, RFC 2672'
-	EQUALITY caseIgnoreIA5Match
-	SUBSTR caseIgnoreIA5SubstringsMatch
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
-
-attributetype ( 1.3.6.1.4.1.2428.20.1.43 NAME 'dSRecord'
-	DESC 'Delegation Signer, RFC 3658'
-	EQUALITY caseIgnoreIA5Match
-	SUBSTR caseIgnoreIA5SubstringsMatch
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
-
-attributetype ( 1.3.6.1.4.1.2428.20.1.46 NAME 'rRSIGRecord'
-	DESC 'RRSIG, RFC 3755'
-	EQUALITY caseIgnoreIA5Match
-	SUBSTR caseIgnoreIA5SubstringsMatch
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
-
-attributetype ( 1.3.6.1.4.1.2428.20.1.47 NAME 'nSECRecord'
-	DESC 'NSEC, RFC 3755'
-	EQUALITY caseIgnoreIA5Match
-	SUBSTR caseIgnoreIA5SubstringsMatch
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
-
-objectclass ( 1.3.6.1.4.1.2428.20.3 NAME 'dNSZone'
-        SUP top STRUCTURAL
-	MUST ( zoneName $ relativeDomainName )
-        MAY ( DNSTTL $ DNSClass $
-              ARecord $ MDRecord $ MXRecord $ NSRecord $
-	      SOARecord $ CNAMERecord $ PTRRecord $ HINFORecord $
-              MINFORecord $ TXTRecord $ SIGRecord $ KEYRecord $
-              AAAARecord $ LOCRecord $ NXTRecord $ SRVRecord $
-              NAPTRRecord $ KXRecord $ CERTRecord $ A6Record $
-              DNAMERecord ) )
diff --git a/ldap2zone.1 b/ldap2zone.1
deleted file mode 100644
index a48c69f..0000000
--- a/ldap2zone.1
+++ /dev/null
@@ -1,41 +0,0 @@
-.\" Copyright (C) 2004, 2005 Stig Venaas <venaas@uninett.no>
-.\" 
-.\" Permission to use, copy, modify, and distribute this software for any
-.\" purpose with or without fee is hereby granted, provided that the above
-.\" copyright notice and this permission notice appear in all copies.
-.\" Manpage written by Jan Gorig
-.TH ldap2zone 1 "15 March 2010" "BIND9"
-.SH NAME
-ldap2zone - Creates zone file from LDAP dnszone information
-.SH SYNOPSIS
-.B ldap2zone zone-name LDAP-URL default-ttl [serial]
-.SH DESCRIPTION
-ldap2zone is a tool that reads info for a zone from LDAP and constructs a standard plain ascii zone file that is written to the standard output. The LDAP information has to be stored using the dnszone schema. The schema is used by BIND with LDAP back-end.
-
-\fBzone-name\fR
-.RS 4
-Name of the zone, eg "mydomain.net."
-.RE
-.PP
-\fBLDAP-URL\fR
-.RS 4
-LDAP URL to dnszone information
-.RE
-.PP
-\fBdefault-ttl\fR
-.RS 4
-Default TTL value to be used in zone
-.RE
-.PP
-\fBserial\fR
-.RS 4
-(optional) Program checks this number to be different than SOA serial number.
-.RE
-
-.SH "EXIT STATUS"
-Exits with 0 on success or 1 on failure.
-.SH "SEE ALSO"
-named(8) ldap(3) 
-http://www.venaas.no/dns/ldap2zone/
-.SH "COPYRIGHT"
-Copyright (C) 2004, 2005 Stig Venaas
diff --git a/named-sdb-chroot-setup.service b/named-sdb-chroot-setup.service
deleted file mode 100644
index 5a3e173..0000000
--- a/named-sdb-chroot-setup.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=Set-up/destroy chroot environment for named-sdb
-BindsTo=named-sdb-chroot.service
-Wants=named-setup-rndc.service
-After=named-setup-rndc.service
-
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-ExecStart=/usr/libexec/setup-named-chroot.sh /var/named/chroot_sdb on /etc/named-chroot.files
-ExecStop=/usr/libexec/setup-named-chroot.sh /var/named/chroot_sdb off /etc/named-chroot.files
diff --git a/named-sdb-chroot.service b/named-sdb-chroot.service
deleted file mode 100644
index acf88ba..0000000
--- a/named-sdb-chroot.service
+++ /dev/null
@@ -1,30 +0,0 @@
-# Don't forget to add "$AddUnixListenSocket /var/named/chroot_sdb/dev/log"
-# line to your /etc/rsyslog.conf file. Otherwise your logging becomes
-# broken when rsyslogd daemon is restarted (due update, for example).
-
-[Unit]
-Description=Berkeley Internet Name Domain (DNS)
-Wants=nss-lookup.target
-Requires=named-sdb-chroot-setup.service
-Before=nss-lookup.target
-After=named-sdb-chroot-setup.service
-After=network.target
-
-[Service]
-Type=forking
-Environment=NAMEDCONF=/etc/named.conf
-EnvironmentFile=-/etc/sysconfig/named
-Environment=KRB5_KTNAME=/etc/named.keytab
-PIDFile=/var/named/chroot_sdb/run/named/named.pid
-
-ExecStartPre=/bin/bash -c 'if [ ! "$DISABLE_ZONE_CHECKING" == "yes" ]; then /usr/sbin/named-checkconf -t /var/named/chroot_sdb -z "$NAMEDCONF"; else echo "Checking of zone files is disabled"; fi'
-ExecStart=/usr/sbin/named-sdb -u named -c ${NAMEDCONF} -t /var/named/chroot_sdb $OPTIONS
-
-ExecReload=/bin/sh -c 'if /usr/sbin/rndc null > /dev/null 2>&1; then /usr/sbin/rndc reload; else /bin/kill -HUP $MAINPID; fi'
-
-ExecStop=/bin/sh -c '/usr/sbin/rndc stop > /dev/null 2>&1 || /bin/kill -TERM $MAINPID'
-
-PrivateTmp=false
-
-[Install]
-WantedBy=multi-user.target
diff --git a/named-sdb.8 b/named-sdb.8
deleted file mode 100644
index 1e456c3..0000000
--- a/named-sdb.8
+++ /dev/null
@@ -1 +0,0 @@
-.so man8/named.8.gz
\ No newline at end of file
diff --git a/named-sdb.service b/named-sdb.service
deleted file mode 100644
index cdf3a62..0000000
--- a/named-sdb.service
+++ /dev/null
@@ -1,26 +0,0 @@
-[Unit]
-Description=Berkeley Internet Name Domain (DNS)
-Wants=nss-lookup.target
-Wants=named-setup-rndc.service
-Before=nss-lookup.target
-After=named-setup-rndc.service
-After=network.target
-
-[Service]
-Type=forking
-Environment=NAMEDCONF=/etc/named.conf
-EnvironmentFile=-/etc/sysconfig/named
-Environment=KRB5_KTNAME=/etc/named.keytab
-PIDFile=/run/named/named.pid
-
-ExecStartPre=/bin/bash -c 'if [ ! "$DISABLE_ZONE_CHECKING" == "yes" ]; then /usr/sbin/named-checkconf -z "$NAMEDCONF"; else echo "Checking of zone files is disabled"; fi'
-ExecStart=/usr/sbin/named-sdb -u named -c ${NAMEDCONF} $OPTIONS
-
-ExecReload=/bin/sh -c 'if /usr/sbin/rndc null > /dev/null 2>&1; then /usr/sbin/rndc reload; else /bin/kill -HUP $MAINPID; fi'
-
-ExecStop=/bin/sh -c '/usr/sbin/rndc stop > /dev/null 2>&1 || /bin/kill -TERM $MAINPID'
-
-PrivateTmp=true
-
-[Install]
-WantedBy=multi-user.target
diff --git a/zone2sqlite.1 b/zone2sqlite.1
deleted file mode 100644
index 6897827..0000000
--- a/zone2sqlite.1
+++ /dev/null
@@ -1,53 +0,0 @@
-.\" Copyright (C) 2004, 2005, 2007-2009 Internet Systems Consortium, Inc. ("ISC")
-.\" Copyright (C) 2000, 2001 Internet Software Consortium.
-.\" 
-.\" Permission to use, copy, modify, and/or distribute this software for any
-.\" purpose with or without fee is hereby granted, provided that the above
-.\" copyright notice and this permission notice appear in all copies.
-.\" 
-.\" THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
-.\" REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-.\" AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
-.\" INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
-.\" LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
-.\" OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-.\" PERFORMANCE OF THIS SOFTWARE.
-.\"
-.\" Manpage written by Jan Gorig
-.TH zone2sqlite 1 "15 March 2010" "BIND9"
-.SH NAME
-zone2sqlite - Load BIND 9 zone file into SQLite database
-.SH SYNOPSIS
-.B zone2sqlite zone zonefile dbfile dbtable
-.SH DESCRIPTION
-zone2sqlite parses DNS zone file and creates database for use with SQLite BIND SDB driver.
-
-\fBzone\fR
-.RS 4
-Zone origin, eg "mydomain.net."
-.RE
-.PP
-\fBzonefile\fR
-.RS 4
-Master zone database file, eg. mydomain.net.zone
-.RE
-.PP
-\fBdbfile\fR
-.RS 4
-Name of SQLite database file
-.RE
-.PP
-\fBdbtable\fR
-.RS 4
-Name of table in database
-.RE
-
-.SH "EXIT STATUS"
-Exits with 0 on success or 1 on failure.
-.SH "SEE ALSO"
-named(8)
-.SH "COPYRIGHT"
-Copyright \(co 2004, 2005, 2007\-2009 Internet Systems Consortium, Inc. ("ISC")
-.br
-Copyright \(co 2000, 2001 Internet Software Consortium.
-.br
diff --git a/zonetodb.1 b/zonetodb.1
deleted file mode 100644
index 897e74f..0000000
--- a/zonetodb.1
+++ /dev/null
@@ -1,53 +0,0 @@
-.\" Copyright (C) 2004, 2005, 2007-2009 Internet Systems Consortium, Inc. ("ISC")
-.\" Copyright (C) 2000, 2001 Internet Software Consortium.
-.\" 
-.\" Permission to use, copy, modify, and/or distribute this software for any
-.\" purpose with or without fee is hereby granted, provided that the above
-.\" copyright notice and this permission notice appear in all copies.
-.\" 
-.\" THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
-.\" REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-.\" AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
-.\" INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
-.\" LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
-.\" OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-.\" PERFORMANCE OF THIS SOFTWARE.
-.\"
-.\" Manpage written by Jan Gorig
-.TH zonetodb 1 "15 March 2010" "BIND9"
-.SH NAME
-zonetodb - Generate a PostgreSQL table from a zone.
-.SH SYNOPSIS
-.B zonetodb origin file dbname dbtable
-.SH DESCRIPTION
-zonetodb parses DNS zone file and creates table in selected database for use with PostgreSQL BIND SDB driver.
-
-\fBzone\fR
-.RS 4
-Zone origin, eg "pgdb.net."
-.RE
-.PP
-\fBfile\fR
-.RS 4
-Master zone database file, eg. pgdb.net.db
-.RE
-.PP
-\fBdbname\fR
-.RS 4
-Name of PostgreSQL database (database must exist)
-.RE
-.PP
-\fBdbtable\fR
-.RS 4
-Name of table in database
-.RE
-
-.SH "EXIT STATUS"
-Exits with 0 on success or 1 on failure.
-.SH "SEE ALSO"
-named(8)
-.SH "COPYRIGHT"
-Copyright \(co 2004, 2005, 2007\-2009 Internet Systems Consortium, Inc. ("ISC")
-.br
-Copyright \(co 2000, 2001 Internet Software Consortium.
-.br