--- source4/dns_server/wscript_build.orig	2019-01-15 10:07:00 UTC
+++ source4/dns_server/wscript_build
@@ -68,6 +68,26 @@ bld.SAMBA_LIBRARY('dlz_bind9_12',
                   deps='samba-hostconfig samdb-common gensec popt dnsserver_common',
                   enabled=bld.AD_DC_BUILD_IS_ENABLED())
 
+bld.SAMBA_LIBRARY('dlz_bind9_13',
+                  source='dlz_bind9.c',
+                  cflags='-DBIND_VERSION_9_13',
+                  private_library=True,
+                  link_name='modules/bind9/dlz_bind9_13.so',
+                  realname='dlz_bind9_13.so',
+                  install_path='${MODULESDIR}/bind9',
+                  deps='samba-hostconfig samdb-common gensec popt dnsserver_common',
+                  enabled=bld.AD_DC_BUILD_IS_ENABLED())
+
+bld.SAMBA_LIBRARY('dlz_bind9_14',
+                  source='dlz_bind9.c',
+                  cflags='-DBIND_VERSION_9_14',
+                  private_library=True,
+                  link_name='modules/bind9/dlz_bind9_14.so',
+                  realname='dlz_bind9_14.so',
+                  install_path='${MODULESDIR}/bind9',
+                  deps='samba-hostconfig samdb-common gensec popt dnsserver_common',
+                  enabled=bld.AD_DC_BUILD_IS_ENABLED())
+
 bld.SAMBA_LIBRARY('dlz_bind9_for_torture',
                   source='dlz_bind9.c',
                   cflags='-DBIND_VERSION_9_8',
--- source4/dns_server/dlz_minimal.h.orig	2019-01-15 10:07:00 UTC
+++ source4/dns_server/dlz_minimal.h
@@ -31,10 +31,7 @@
 #elif defined (BIND_VERSION_9_10)
 # define DLZ_DLOPEN_VERSION 3
 # define DNS_CLIENTINFO_VERSION 1
-#elif defined (BIND_VERSION_9_11)
-# define DLZ_DLOPEN_VERSION 3
-# define DNS_CLIENTINFO_VERSION 2
-#elif defined (BIND_VERSION_9_12)
+#elif defined (BIND_VERSION_9_11) || defined (BIND_VERSION_9_12) || defined (BIND_VERSION_9_13) || defined (BIND_VERSION_9_14)
 # define DLZ_DLOPEN_VERSION 3
 # define DNS_CLIENTINFO_VERSION 2
 #else
--- source4/setup/named.conf.dlz.orig	2019-06-22 09:56:57 UTC
+++ source4/setup/named.conf.dlz
@@ -22,5 +22,8 @@ dlz "AD DNS Zone" {
     # For BIND 9.11.x
     ${BIND9_11} database "dlopen ${MODULESDIR}/bind9/dlz_bind9_11.so";
 
+    # For BIND 9.12.x
+    ${BIND9_12} database "dlopen ${MODULESDIR}/bind9/dlz_bind9_12.so";
+
 };
 
--- python/samba/provision/sambadns.py.orig	2019-01-15 10:07:00 UTC
+++ python/samba/provision/sambadns.py
@@ -960,6 +960,8 @@ def create_named_conf(paths, realm, dnsd
         bind9_10 = '#'
         bind9_11 = '#'
         bind9_12 = '#'
+        bind9_13 = '#'
+        bind9_14 = '#'
         if bind_info.upper().find('BIND 9.8') != -1:
             bind9_8 = ''
         elif bind_info.upper().find('BIND 9.9') != -1:
@@ -970,6 +972,10 @@ def create_named_conf(paths, realm, dnsd
             bind9_11 = ''
         elif bind_info.upper().find('BIND 9.12') != -1:
             bind9_12 = ''
+        elif bind_info.upper().find('BIND 9.13') != -1:
+            bind9_13 = ''
+        elif bind_info.upper().find('BIND 9.14') != -1:
+            bind9_14 = ''
         elif bind_info.upper().find('BIND 9.7') != -1:
             raise ProvisioningError("DLZ option incompatible with BIND 9.7.")
         else:
@@ -981,8 +987,9 @@ def create_named_conf(paths, realm, dnsd
                     "BIND9_9": bind9_9,
                     "BIND9_10": bind9_10,
                     "BIND9_11": bind9_11,
-                    "BIND9_12": bind9_12
-
+                    "BIND9_12" : bind9_12,
+                    "BIND9_13" : bind9_13,
+                    "BIND9_14" : bind9_14
                     })