diff --git a/dns/bind9/Makefile b/dns/bind9/Makefile
index a9ae9857b34d..275860df39eb 100644
--- a/dns/bind9/Makefile
+++ b/dns/bind9/Makefile
@@ -12,7 +12,7 @@
 # release you can generally build it cleanly from the source - Doug
 
 PORTNAME=	bind9
-PORTVERSION=	9.3.1
+PORTVERSION=	9.3.2
 CATEGORIES=	dns net ipv6
 MASTER_SITES=	${MASTER_SITE_ISC} \
 		http://dougbarton.us/Downloads/%SUBDIR%/
@@ -25,7 +25,7 @@ MAINTAINER=	DougB@FreeBSD.org
 COMMENT=	Completely new version of the BIND DNS suite with updated DNSSEC
 
 # ISC releases things like 9.3.0rc1, which our versioning doesn't like
-ISCVERSION=	9.3.1
+ISCVERSION=	9.3.2
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--localstatedir=/var --disable-linux-caps \
diff --git a/dns/bind9/distinfo b/dns/bind9/distinfo
index 0a97953a9120..309110894648 100644
--- a/dns/bind9/distinfo
+++ b/dns/bind9/distinfo
@@ -1,6 +1,6 @@
-MD5 (bind-9.3.1.tar.gz) = 9ff3204eea27184ea0722f37e43fc95d
-SHA256 (bind-9.3.1.tar.gz) = 9a9411115338d2554f2e99bc676c2e9a381a8d649bf9bd9c0b2ffa2cf74b563c
-SIZE (bind-9.3.1.tar.gz) = 4673603
-MD5 (bind-9.3.1.tar.gz.asc) = b2077443ade50ed778aa78a8014affaa
-SHA256 (bind-9.3.1.tar.gz.asc) = 288cd81c1fc9e8cc2764f1c2464b948f0541af231d615df85803ba430314d803
-SIZE (bind-9.3.1.tar.gz.asc) = 186
+MD5 (bind-9.3.2.tar.gz) = 55e709501a7780233c36e25ccd15ece2
+SHA256 (bind-9.3.2.tar.gz) = 4d4298abd85d06083a0643091dde05ffbe3db051439524dbe4a81c689735c694
+SIZE (bind-9.3.2.tar.gz) = 5302112
+MD5 (bind-9.3.2.tar.gz.asc) = 06eccb8a9122e0f6efa9502cc61f5006
+SHA256 (bind-9.3.2.tar.gz.asc) = b7a9bc3852bb75e390d457e4449083a90c1c267f68fae00f317b9712ef726cf3
+SIZE (bind-9.3.2.tar.gz.asc) = 187
diff --git a/dns/bind9/files/patch-lib_dns_resolver.c b/dns/bind9/files/patch-lib_dns_resolver.c
deleted file mode 100644
index 5605bb71f3ec..000000000000
--- a/dns/bind9/files/patch-lib_dns_resolver.c
+++ /dev/null
@@ -1,23 +0,0 @@
---- lib/dns/resolver.c.orig	Tue Feb  8 15:59:44 2005
-+++ lib/dns/resolver.c	Wed Aug 17 02:42:48 2005
-@@ -2665,7 +2665,7 @@
- 	    unsigned int options, unsigned int bucketnum, fetchctx_t **fctxp)
- {
- 	fetchctx_t *fctx;
--	isc_result_t result = ISC_R_SUCCESS;
-+	isc_result_t result;
- 	isc_result_t iresult;
- 	isc_interval_t interval;
- 	dns_fixedname_t qdomain;
-@@ -2687,8 +2687,10 @@
- 	strcat(buf, "/");	/* checked */
- 	strcat(buf, typebuf);	/* checked */
- 	fctx->info = isc_mem_strdup(res->mctx, buf);
--	if (fctx->info == NULL)
-+	if (fctx->info == NULL) {
-+		result = ISC_R_NOMEMORY;
- 		goto cleanup_fetch;
-+	}
- 	FCTXTRACE("create");
- 	dns_name_init(&fctx->name, NULL);
- 	result = dns_name_dup(name, res->mctx, &fctx->name);
diff --git a/dns/bind9/pkg-plist b/dns/bind9/pkg-plist
index 4a8755f67d6c..e5965595781f 100644
--- a/dns/bind9/pkg-plist
+++ b/dns/bind9/pkg-plist
@@ -90,6 +90,7 @@ include/isc/eventclass.h
 include/isc/file.h
 include/isc/formatcheck.h
 include/isc/fsaccess.h
+include/isc/hash.h
 include/isc/heap.h
 include/isc/hex.h
 include/isc/hmacmd5.h
diff --git a/dns/bind94/Makefile b/dns/bind94/Makefile
index a9ae9857b34d..275860df39eb 100644
--- a/dns/bind94/Makefile
+++ b/dns/bind94/Makefile
@@ -12,7 +12,7 @@
 # release you can generally build it cleanly from the source - Doug
 
 PORTNAME=	bind9
-PORTVERSION=	9.3.1
+PORTVERSION=	9.3.2
 CATEGORIES=	dns net ipv6
 MASTER_SITES=	${MASTER_SITE_ISC} \
 		http://dougbarton.us/Downloads/%SUBDIR%/
@@ -25,7 +25,7 @@ MAINTAINER=	DougB@FreeBSD.org
 COMMENT=	Completely new version of the BIND DNS suite with updated DNSSEC
 
 # ISC releases things like 9.3.0rc1, which our versioning doesn't like
-ISCVERSION=	9.3.1
+ISCVERSION=	9.3.2
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--localstatedir=/var --disable-linux-caps \
diff --git a/dns/bind94/distinfo b/dns/bind94/distinfo
index 0a97953a9120..309110894648 100644
--- a/dns/bind94/distinfo
+++ b/dns/bind94/distinfo
@@ -1,6 +1,6 @@
-MD5 (bind-9.3.1.tar.gz) = 9ff3204eea27184ea0722f37e43fc95d
-SHA256 (bind-9.3.1.tar.gz) = 9a9411115338d2554f2e99bc676c2e9a381a8d649bf9bd9c0b2ffa2cf74b563c
-SIZE (bind-9.3.1.tar.gz) = 4673603
-MD5 (bind-9.3.1.tar.gz.asc) = b2077443ade50ed778aa78a8014affaa
-SHA256 (bind-9.3.1.tar.gz.asc) = 288cd81c1fc9e8cc2764f1c2464b948f0541af231d615df85803ba430314d803
-SIZE (bind-9.3.1.tar.gz.asc) = 186
+MD5 (bind-9.3.2.tar.gz) = 55e709501a7780233c36e25ccd15ece2
+SHA256 (bind-9.3.2.tar.gz) = 4d4298abd85d06083a0643091dde05ffbe3db051439524dbe4a81c689735c694
+SIZE (bind-9.3.2.tar.gz) = 5302112
+MD5 (bind-9.3.2.tar.gz.asc) = 06eccb8a9122e0f6efa9502cc61f5006
+SHA256 (bind-9.3.2.tar.gz.asc) = b7a9bc3852bb75e390d457e4449083a90c1c267f68fae00f317b9712ef726cf3
+SIZE (bind-9.3.2.tar.gz.asc) = 187
diff --git a/dns/bind94/files/patch-lib_dns_resolver.c b/dns/bind94/files/patch-lib_dns_resolver.c
deleted file mode 100644
index 5605bb71f3ec..000000000000
--- a/dns/bind94/files/patch-lib_dns_resolver.c
+++ /dev/null
@@ -1,23 +0,0 @@
---- lib/dns/resolver.c.orig	Tue Feb  8 15:59:44 2005
-+++ lib/dns/resolver.c	Wed Aug 17 02:42:48 2005
-@@ -2665,7 +2665,7 @@
- 	    unsigned int options, unsigned int bucketnum, fetchctx_t **fctxp)
- {
- 	fetchctx_t *fctx;
--	isc_result_t result = ISC_R_SUCCESS;
-+	isc_result_t result;
- 	isc_result_t iresult;
- 	isc_interval_t interval;
- 	dns_fixedname_t qdomain;
-@@ -2687,8 +2687,10 @@
- 	strcat(buf, "/");	/* checked */
- 	strcat(buf, typebuf);	/* checked */
- 	fctx->info = isc_mem_strdup(res->mctx, buf);
--	if (fctx->info == NULL)
-+	if (fctx->info == NULL) {
-+		result = ISC_R_NOMEMORY;
- 		goto cleanup_fetch;
-+	}
- 	FCTXTRACE("create");
- 	dns_name_init(&fctx->name, NULL);
- 	result = dns_name_dup(name, res->mctx, &fctx->name);
diff --git a/dns/bind94/pkg-plist b/dns/bind94/pkg-plist
index 4a8755f67d6c..e5965595781f 100644
--- a/dns/bind94/pkg-plist
+++ b/dns/bind94/pkg-plist
@@ -90,6 +90,7 @@ include/isc/eventclass.h
 include/isc/file.h
 include/isc/formatcheck.h
 include/isc/fsaccess.h
+include/isc/hash.h
 include/isc/heap.h
 include/isc/hex.h
 include/isc/hmacmd5.h
diff --git a/dns/bind95/Makefile b/dns/bind95/Makefile
index a9ae9857b34d..275860df39eb 100644
--- a/dns/bind95/Makefile
+++ b/dns/bind95/Makefile
@@ -12,7 +12,7 @@
 # release you can generally build it cleanly from the source - Doug
 
 PORTNAME=	bind9
-PORTVERSION=	9.3.1
+PORTVERSION=	9.3.2
 CATEGORIES=	dns net ipv6
 MASTER_SITES=	${MASTER_SITE_ISC} \
 		http://dougbarton.us/Downloads/%SUBDIR%/
@@ -25,7 +25,7 @@ MAINTAINER=	DougB@FreeBSD.org
 COMMENT=	Completely new version of the BIND DNS suite with updated DNSSEC
 
 # ISC releases things like 9.3.0rc1, which our versioning doesn't like
-ISCVERSION=	9.3.1
+ISCVERSION=	9.3.2
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--localstatedir=/var --disable-linux-caps \
diff --git a/dns/bind95/distinfo b/dns/bind95/distinfo
index 0a97953a9120..309110894648 100644
--- a/dns/bind95/distinfo
+++ b/dns/bind95/distinfo
@@ -1,6 +1,6 @@
-MD5 (bind-9.3.1.tar.gz) = 9ff3204eea27184ea0722f37e43fc95d
-SHA256 (bind-9.3.1.tar.gz) = 9a9411115338d2554f2e99bc676c2e9a381a8d649bf9bd9c0b2ffa2cf74b563c
-SIZE (bind-9.3.1.tar.gz) = 4673603
-MD5 (bind-9.3.1.tar.gz.asc) = b2077443ade50ed778aa78a8014affaa
-SHA256 (bind-9.3.1.tar.gz.asc) = 288cd81c1fc9e8cc2764f1c2464b948f0541af231d615df85803ba430314d803
-SIZE (bind-9.3.1.tar.gz.asc) = 186
+MD5 (bind-9.3.2.tar.gz) = 55e709501a7780233c36e25ccd15ece2
+SHA256 (bind-9.3.2.tar.gz) = 4d4298abd85d06083a0643091dde05ffbe3db051439524dbe4a81c689735c694
+SIZE (bind-9.3.2.tar.gz) = 5302112
+MD5 (bind-9.3.2.tar.gz.asc) = 06eccb8a9122e0f6efa9502cc61f5006
+SHA256 (bind-9.3.2.tar.gz.asc) = b7a9bc3852bb75e390d457e4449083a90c1c267f68fae00f317b9712ef726cf3
+SIZE (bind-9.3.2.tar.gz.asc) = 187
diff --git a/dns/bind95/files/patch-lib_dns_resolver.c b/dns/bind95/files/patch-lib_dns_resolver.c
deleted file mode 100644
index 5605bb71f3ec..000000000000
--- a/dns/bind95/files/patch-lib_dns_resolver.c
+++ /dev/null
@@ -1,23 +0,0 @@
---- lib/dns/resolver.c.orig	Tue Feb  8 15:59:44 2005
-+++ lib/dns/resolver.c	Wed Aug 17 02:42:48 2005
-@@ -2665,7 +2665,7 @@
- 	    unsigned int options, unsigned int bucketnum, fetchctx_t **fctxp)
- {
- 	fetchctx_t *fctx;
--	isc_result_t result = ISC_R_SUCCESS;
-+	isc_result_t result;
- 	isc_result_t iresult;
- 	isc_interval_t interval;
- 	dns_fixedname_t qdomain;
-@@ -2687,8 +2687,10 @@
- 	strcat(buf, "/");	/* checked */
- 	strcat(buf, typebuf);	/* checked */
- 	fctx->info = isc_mem_strdup(res->mctx, buf);
--	if (fctx->info == NULL)
-+	if (fctx->info == NULL) {
-+		result = ISC_R_NOMEMORY;
- 		goto cleanup_fetch;
-+	}
- 	FCTXTRACE("create");
- 	dns_name_init(&fctx->name, NULL);
- 	result = dns_name_dup(name, res->mctx, &fctx->name);
diff --git a/dns/bind95/pkg-plist b/dns/bind95/pkg-plist
index 4a8755f67d6c..e5965595781f 100644
--- a/dns/bind95/pkg-plist
+++ b/dns/bind95/pkg-plist
@@ -90,6 +90,7 @@ include/isc/eventclass.h
 include/isc/file.h
 include/isc/formatcheck.h
 include/isc/fsaccess.h
+include/isc/hash.h
 include/isc/heap.h
 include/isc/hex.h
 include/isc/hmacmd5.h
diff --git a/dns/bind96/Makefile b/dns/bind96/Makefile
index a9ae9857b34d..275860df39eb 100644
--- a/dns/bind96/Makefile
+++ b/dns/bind96/Makefile
@@ -12,7 +12,7 @@
 # release you can generally build it cleanly from the source - Doug
 
 PORTNAME=	bind9
-PORTVERSION=	9.3.1
+PORTVERSION=	9.3.2
 CATEGORIES=	dns net ipv6
 MASTER_SITES=	${MASTER_SITE_ISC} \
 		http://dougbarton.us/Downloads/%SUBDIR%/
@@ -25,7 +25,7 @@ MAINTAINER=	DougB@FreeBSD.org
 COMMENT=	Completely new version of the BIND DNS suite with updated DNSSEC
 
 # ISC releases things like 9.3.0rc1, which our versioning doesn't like
-ISCVERSION=	9.3.1
+ISCVERSION=	9.3.2
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--localstatedir=/var --disable-linux-caps \
diff --git a/dns/bind96/distinfo b/dns/bind96/distinfo
index 0a97953a9120..309110894648 100644
--- a/dns/bind96/distinfo
+++ b/dns/bind96/distinfo
@@ -1,6 +1,6 @@
-MD5 (bind-9.3.1.tar.gz) = 9ff3204eea27184ea0722f37e43fc95d
-SHA256 (bind-9.3.1.tar.gz) = 9a9411115338d2554f2e99bc676c2e9a381a8d649bf9bd9c0b2ffa2cf74b563c
-SIZE (bind-9.3.1.tar.gz) = 4673603
-MD5 (bind-9.3.1.tar.gz.asc) = b2077443ade50ed778aa78a8014affaa
-SHA256 (bind-9.3.1.tar.gz.asc) = 288cd81c1fc9e8cc2764f1c2464b948f0541af231d615df85803ba430314d803
-SIZE (bind-9.3.1.tar.gz.asc) = 186
+MD5 (bind-9.3.2.tar.gz) = 55e709501a7780233c36e25ccd15ece2
+SHA256 (bind-9.3.2.tar.gz) = 4d4298abd85d06083a0643091dde05ffbe3db051439524dbe4a81c689735c694
+SIZE (bind-9.3.2.tar.gz) = 5302112
+MD5 (bind-9.3.2.tar.gz.asc) = 06eccb8a9122e0f6efa9502cc61f5006
+SHA256 (bind-9.3.2.tar.gz.asc) = b7a9bc3852bb75e390d457e4449083a90c1c267f68fae00f317b9712ef726cf3
+SIZE (bind-9.3.2.tar.gz.asc) = 187
diff --git a/dns/bind96/files/patch-lib_dns_resolver.c b/dns/bind96/files/patch-lib_dns_resolver.c
deleted file mode 100644
index 5605bb71f3ec..000000000000
--- a/dns/bind96/files/patch-lib_dns_resolver.c
+++ /dev/null
@@ -1,23 +0,0 @@
---- lib/dns/resolver.c.orig	Tue Feb  8 15:59:44 2005
-+++ lib/dns/resolver.c	Wed Aug 17 02:42:48 2005
-@@ -2665,7 +2665,7 @@
- 	    unsigned int options, unsigned int bucketnum, fetchctx_t **fctxp)
- {
- 	fetchctx_t *fctx;
--	isc_result_t result = ISC_R_SUCCESS;
-+	isc_result_t result;
- 	isc_result_t iresult;
- 	isc_interval_t interval;
- 	dns_fixedname_t qdomain;
-@@ -2687,8 +2687,10 @@
- 	strcat(buf, "/");	/* checked */
- 	strcat(buf, typebuf);	/* checked */
- 	fctx->info = isc_mem_strdup(res->mctx, buf);
--	if (fctx->info == NULL)
-+	if (fctx->info == NULL) {
-+		result = ISC_R_NOMEMORY;
- 		goto cleanup_fetch;
-+	}
- 	FCTXTRACE("create");
- 	dns_name_init(&fctx->name, NULL);
- 	result = dns_name_dup(name, res->mctx, &fctx->name);
diff --git a/dns/bind96/pkg-plist b/dns/bind96/pkg-plist
index 4a8755f67d6c..e5965595781f 100644
--- a/dns/bind96/pkg-plist
+++ b/dns/bind96/pkg-plist
@@ -90,6 +90,7 @@ include/isc/eventclass.h
 include/isc/file.h
 include/isc/formatcheck.h
 include/isc/fsaccess.h
+include/isc/hash.h
 include/isc/heap.h
 include/isc/hex.h
 include/isc/hmacmd5.h