diff --git a/bind.spec b/bind.spec
index 205b723..768ef33 100644
--- a/bind.spec
+++ b/bind.spec
@@ -16,8 +16,6 @@
 %bcond_without PKCS11
 %bcond_without DEVEL
 %bcond_without JSON
-%bcond_with    BDB
-# skip DLZ for now
 %bcond_without DLZ
 # New MaxMind GeoLite support
 %bcond_without GEOIP2
@@ -161,9 +159,6 @@ BuildRequires:  libuv-devel
 %if %{with DLZ}
 BuildRequires:  openldap-devel, libpq-devel, sqlite-devel, mariadb-connector-c-devel
 %endif
-%if %{with BDB}
-BuildRequires:  libdb-devel
-%endif
 %if %{with UNITTEST}
 # make unit dependencies
 BuildRequires:  libcmocka-devel kyua
@@ -364,18 +359,6 @@ Based on the code from Jan "Yenya" Kasprzak <kas@fi.muni.cz>
 
 
 %if %{with DLZ}
-%if %{with BDB}
-%package dlz-bdb
-Summary: BIND server bdb DLZ module
-Requires: bind%{?_isa} = %{epoch}:%{version}-%{release}
-
-%description dlz-bdb
-Dynamic Loadable Zones Berkeley DB module for BIND server.
-
-%end
-
-%endif
-
 %package dlz-filesystem
 Summary: BIND server filesystem DLZ module
 Requires: bind%{?_isa} = %{epoch}:%{version}-%{release}
@@ -544,15 +527,6 @@ export LIBDIR_SUFFIX
   --with-pkcs11=%{_libdir}/pkcs11/libsofthsm2.so \
 %endif
   --with-dlopen=yes \
-%if %{with DLZ}
-  --with-dlz-ldap=yes \
-  --with-dlz-postgres=yes \
-  --with-dlz-mysql=yes \
-  --with-dlz-filesystem=yes \
-%endif
-%if %{with BDB}
-  --with-dlz-bdb=yes \
-%endif
 %if %{with GSSTSIG}
   --with-gssapi=yes \
   --disable-isc-spnego \
@@ -617,18 +591,15 @@ popd
 %if %{with DLZ}
   pushd contrib/dlz
   pushd modules
+  for DIR in mysql mysqldyn; do
+    sed -e 's/@DLZ_DRIVER_MYSQL_INCLUDES@/$(shell mysql_config --cflags)/' \
+        -e 's/@DLZ_DRIVER_MYSQL_LIBS@/$(shell mysql_config --libs)/' \
+        $DIR/Makefile.in > $DIR/Makefile
+  done
   for DIR in filesystem ldap mysql mysqldyn sqlite3; do
     make -C $DIR CFLAGS="-fPIC -I../include $CFLAGS $LDFLAGS"
   done
   popd
-  %if %{with BDB}
-    pushd bin/dlzbdb
-      make
-    popd
-    pushd modules
-      make -C bdbhpt CFLAGS="-fPIC -I../include $CFLAGS $LDFLAGS"
-    popd
-  %endif
   popd
 %endif
 popd # build
@@ -756,15 +727,7 @@ install -m 644 %{SOURCE49} ${RPM_BUILD_ROOT}%{_sysconfdir}/named-chroot.files
     make -C $DIR DESTDIR=${RPM_BUILD_ROOT} libdir=%{_libdir}/bind install
   done
   mv mysqldyn/testing/README mysqldyn/testing/README.testing
-  %if %{with BDB}
-    make -C bdbhpt DESTDIR=${RPM_BUILD_ROOT} libdir=%{_libdir}/bind install
-  %endif
   popd
-  %if %{with BDB}
-    pushd bin/dlzbdb
-      make DESTDIR=${RPM_BUILD_ROOT} install
-    popd
-  %endif
   popd
   popd
 %endif
@@ -1193,14 +1156,6 @@ fi;
 %{_libdir}/libns-pkcs11.so
 %endif
 
-%if %{with DLZ} && %{with BDB}
-%files dlz-bdb
-%{_libdir}/bind/dlz_bdbhpt_dynamic.so
-%doc contrib/dlz/modules/bdbhpt/testing/*
-%doc contrib/dlz/modules/bdbhpt/README*
-
-%endif
-
 %if %{with DLZ}
 %files dlz-filesystem
 %{_libdir}/bind/dlz_filesystem_dynamic.so