diff --git a/dns/bind9-devel/Makefile b/dns/bind9-devel/Makefile
index ca8adc0cdf1e..abd5819aafa7 100644
--- a/dns/bind9-devel/Makefile
+++ b/dns/bind9-devel/Makefile
@@ -33,7 +33,8 @@ COMMENT=	BIND DNS suite with updated DNSSEC and DNS64
 LICENSE=	MPL20
 LICENSE_FILE=	${WRKSRC}/COPYRIGHT
 
-LIB_DEPENDS=	libxml2.so:textproc/libxml2
+LIB_DEPENDS=	libxml2.so:textproc/libxml2 \
+		libuv.so:devel/libuv
 .if !defined(BIND_TOOLS_SLAVE)
 RUN_DEPENDS=	bind-tools>0:dns/bind-tools
 .endif
@@ -41,13 +42,13 @@ RUN_DEPENDS=	bind-tools>0:dns/bind-tools
 # XXX: remove tar:bz2
 USES=	compiler:c11 cpe libedit pkgconfig ssl tar:bz2
 # ISC releases things like 9.8.0-P1, which our versioning doesn't like
-ISCVERSION=	9.15.5a0.2019.10.31
+ISCVERSION=	9.15.5a0.2019.11.12
 # XXX: Remove gitlab
 USE_GITLAB=	yes
 GL_SITE=	https://gitlab.isc.org
 GL_ACCOUNT=	isc-projects
 GL_PROJECT=	bind9
-GL_COMMIT=	d2fdebe02ef58e3b2affe429c028741c4405022b
+GL_COMMIT=	b4a015ebcda51d5975375d64b662963472df76a0
 
 CPE_VENDOR=	isc
 CPE_VERSION=	${ISCVERSION:C/-.*//}
diff --git a/dns/bind9-devel/distinfo b/dns/bind9-devel/distinfo
index 8bb7f873fa7c..281d96cb181f 100644
--- a/dns/bind9-devel/distinfo
+++ b/dns/bind9-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1572875413
-SHA256 (isc-projects-bind9-d2fdebe02ef58e3b2affe429c028741c4405022b_GL0.tar.gz) = 13322a79b0c291b0641e78330b18ea3563df5dfb0aac74b54bdf992aaf7dbac1
-SIZE (isc-projects-bind9-d2fdebe02ef58e3b2affe429c028741c4405022b_GL0.tar.gz) = 6339384
+TIMESTAMP = 1573560175
+SHA256 (isc-projects-bind9-b4a015ebcda51d5975375d64b662963472df76a0_GL0.tar.gz) = 1320b92e42e77d4369fce30b474be5a01bf86394333afcc719bb665fd78d61fc
+SIZE (isc-projects-bind9-b4a015ebcda51d5975375d64b662963472df76a0_GL0.tar.gz) = 6434023
diff --git a/dns/bind9-devel/files/extrapatch-bind-min-override-ttl b/dns/bind9-devel/files/extrapatch-bind-min-override-ttl
index 20a93538bde6..4f9720e083ab 100644
--- a/dns/bind9-devel/files/extrapatch-bind-min-override-ttl
+++ b/dns/bind9-devel/files/extrapatch-bind-min-override-ttl
@@ -1,8 +1,8 @@
 Add the override-cache-ttl feature.
 
---- bin/named/config.c.orig	2019-10-31 19:19:57 UTC
+--- bin/named/config.c.orig	2019-11-12 11:24:41 UTC
 +++ bin/named/config.c
-@@ -177,6 +177,7 @@ options {\n\
+@@ -178,6 +178,7 @@ options {\n\
  	notify-source *;\n\
  	notify-source-v6 *;\n\
  	nsec3-test-zone no;\n\
@@ -10,9 +10,9 @@ Add the override-cache-ttl feature.
  	provide-ixfr true;\n\
  	qname-minimization relaxed;\n\
  	query-source address *;\n\
---- bin/named/server.c.orig	2019-10-31 19:19:57 UTC
+--- bin/named/server.c.orig	2019-11-12 11:24:41 UTC
 +++ bin/named/server.c
-@@ -4215,6 +4215,11 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewl
+@@ -4219,6 +4219,11 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewl
  	}
  
  	obj = NULL;
@@ -23,8 +23,8 @@ Add the override-cache-ttl feature.
 +	obj = NULL;
  	result = named_config_get(maps, "max-cache-ttl", &obj);
  	INSIST(result == ISC_R_SUCCESS);
- 	view->maxcachettl = cfg_obj_asuint32(obj);
---- lib/dns/include/dns/view.h.orig	2019-10-31 19:19:57 UTC
+ 	view->maxcachettl = cfg_obj_asduration(obj);
+--- lib/dns/include/dns/view.h.orig	2019-11-12 11:24:41 UTC
 +++ lib/dns/include/dns/view.h
 @@ -152,6 +152,7 @@ struct dns_view {
  	bool				requestnsid;
@@ -34,7 +34,7 @@ Add the override-cache-ttl feature.
  	dns_ttl_t			maxncachettl;
  	dns_ttl_t			mincachettl;
  	dns_ttl_t			minncachettl;
---- lib/dns/resolver.c.orig	2019-10-31 19:19:57 UTC
+--- lib/dns/resolver.c.orig	2019-11-12 11:24:41 UTC
 +++ lib/dns/resolver.c
 @@ -6056,6 +6056,12 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_adb
  		}
@@ -49,13 +49,13 @@ Add the override-cache-ttl feature.
  		 * Enforce the configure maximum cache TTL.
  		 */
  		if (rdataset->ttl > res->view->maxcachettl) {
---- lib/isccfg/namedconf.c.orig	2019-10-31 19:19:57 UTC
+--- lib/isccfg/namedconf.c.orig	2019-11-12 11:24:41 UTC
 +++ lib/isccfg/namedconf.c
-@@ -1907,6 +1907,7 @@ view_clauses[] = {
+@@ -1980,6 +1980,7 @@ view_clauses[] = {
  #endif
  	{ "max-acache-size", &cfg_type_sizenodefault, CFG_CLAUSEFLAG_OBSOLETE },
  	{ "max-cache-size", &cfg_type_sizeorpercent, 0 },
-+	{ "override-cache-ttl", &cfg_type_ttlval, 0 },
- 	{ "max-cache-ttl", &cfg_type_ttlval, 0 },
++	{ "override-cache-ttl", &cfg_type_duration, 0 },
+ 	{ "max-cache-ttl", &cfg_type_duration, 0 },
  	{ "max-clients-per-query", &cfg_type_uint32, 0 },
- 	{ "max-ncache-ttl", &cfg_type_ttlval, 0 },
+ 	{ "max-ncache-ttl", &cfg_type_duration, 0 },
diff --git a/dns/bind9-devel/files/patch-bin_named_include_named_globals.h b/dns/bind9-devel/files/patch-bin_named_include_named_globals.h
index 7c18545842fc..502a8dc80d58 100644
--- a/dns/bind9-devel/files/patch-bin_named_include_named_globals.h
+++ b/dns/bind9-devel/files/patch-bin_named_include_named_globals.h
@@ -1,8 +1,8 @@
 We reference the pid file as being run/named/pid everywere else.
 
---- bin/named/include/named/globals.h.orig	2019-02-10 20:07:38 UTC
+--- bin/named/include/named/globals.h.orig	2019-11-12 11:24:41 UTC
 +++ bin/named/include/named/globals.h
-@@ -129,7 +129,7 @@ EXTERN bool		named_g_forcelock	INIT(false);
+@@ -131,7 +131,7 @@ EXTERN bool		named_g_forcelock	INIT(false);
  #if NAMED_RUN_PID_DIR
  EXTERN const char *		named_g_defaultpidfile 	INIT(NAMED_LOCALSTATEDIR
  							     "/run/named/"
diff --git a/dns/bind9-devel/files/patch-configure b/dns/bind9-devel/files/patch-configure
index 4d2d4fde9b87..6634ab06f826 100644
--- a/dns/bind9-devel/files/patch-configure
+++ b/dns/bind9-devel/files/patch-configure
@@ -1,8 +1,8 @@
 Fixup gssapi and db detection.
 
---- configure.orig	2019-09-17 18:26:12 UTC
+--- configure.orig	2019-11-12 11:24:41 UTC
 +++ configure
-@@ -17247,27 +17247,9 @@ done
+@@ -17414,27 +17414,9 @@ done
  		# problems start to show up.
  		saved_libs="$LIBS"
  		for TRY_LIBS in \
@@ -32,7 +32,7 @@ Fixup gssapi and db detection.
  		    { $as_echo "$as_me:${as_lineno-$LINENO}: checking linking as $TRY_LIBS" >&5
  $as_echo_n "checking linking as $TRY_LIBS... " >&6; }
  		    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -17310,47 +17292,7 @@ $as_echo "no" >&6; } ;;
+@@ -17477,47 +17459,7 @@ $as_echo "no" >&6; } ;;
  		no) as_fn_error $? "could not determine proper GSSAPI linkage" "$LINENO" 5 ;;
  		esac
  
@@ -81,7 +81,7 @@ Fixup gssapi and db detection.
  		DNS_GSSAPI_LIBS="$LIBS"
  
  		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: using GSSAPI from $use_gssapi/lib and $use_gssapi/include" >&5
-@@ -22689,7 +22631,7 @@ $as_echo "" >&6; }
+@@ -22869,7 +22811,7 @@ $as_echo "" >&6; }
  			# Check other locations for includes.
  			# Order is important (sigh).
  
diff --git a/dns/bind9-devel/pkg-plist b/dns/bind9-devel/pkg-plist
index 5b273e53e2ad..7f8a9bff29df 100644
--- a/dns/bind9-devel/pkg-plist
+++ b/dns/bind9-devel/pkg-plist
@@ -124,6 +124,7 @@ include/irs/version.h
 include/isc/aes.h
 include/isc/app.h
 include/isc/assertions.h
+include/isc/astack.h
 include/isc/atomic.h
 include/isc/backtrace.h
 include/isc/base32.h
@@ -150,6 +151,7 @@ include/isc/hash.h
 include/isc/heap.h
 include/isc/hex.h
 include/isc/hmac.h
+include/isc/hp.h
 include/isc/ht.h
 include/isc/httpd.h
 include/isc/interfaceiter.h