diff --git a/dns/bind8/Makefile b/dns/bind8/Makefile
index 26653e3f0f5c..b0ac451b668e 100644
--- a/dns/bind8/Makefile
+++ b/dns/bind8/Makefile
@@ -12,6 +12,7 @@
 
 PORTNAME=	bind
 PORTVERSION=	8.3.3
+PORTREVISION=	1
 CATEGORIES?=	net
 MASTER_SITES=	${MASTER_SITE_ISC}
 MASTER_SITE_SUBDIR=	bind/src/${PORTVERSION}
@@ -60,11 +61,11 @@ post-install:
 	cd ${WRKDIR}/doc/man && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} \
 		${MAKEFILE} clean all ${INSTALL_TARGET}
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${PREFIX}/share/doc/bind8/html
-	${INSTALL_DATA} ${WRKDIR}/doc/html/*.html ${PREFIX}/share/doc/bind8/html
-	${CP} -Rp ${WRKDIR}/src/conf ${PREFIX}/share/doc/bind8/
+	@${MKDIR} ${DOCSDIR}/html
+	${INSTALL_DATA} ${WRKDIR}/doc/html/*.html ${DOCSDIR}/html
+	${CP} -Rp ${WRKDIR}/src/conf ${DOCSDIR}
 .for file in CHANGES DNSSEC LICENSE LICENSE_RSA README SUPPORT TODO
-	${INSTALL_DATA} ${WRKDIR}/src/${file} ${PREFIX}/share/doc/bind8
+	${INSTALL_DATA} ${WRKDIR}/src/${file} ${DOCSDIR}
 .endfor
 .endif
 
diff --git a/dns/bind8/pkg-plist b/dns/bind8/pkg-plist
index 632062c85af8..aa7c8ee9756c 100644
--- a/dns/bind8/pkg-plist
+++ b/dns/bind8/pkg-plist
@@ -33,51 +33,51 @@ sbin/irpd
 sbin/named
 sbin/named-bootconf
 sbin/ndc
-%%PORTDOCS%%share/doc/bind8/CHANGES
-%%PORTDOCS%%share/doc/bind8/DNSSEC
-%%PORTDOCS%%share/doc/bind8/LICENSE
-%%PORTDOCS%%share/doc/bind8/LICENSE_RSA
-%%PORTDOCS%%share/doc/bind8/README
-%%PORTDOCS%%share/doc/bind8/SUPPORT
-%%PORTDOCS%%share/doc/bind8/TODO
-%%PORTDOCS%%share/doc/bind8/conf/README
-%%PORTDOCS%%share/doc/bind8/conf/recursive/keep-running
-%%PORTDOCS%%share/doc/bind8/conf/recursive/named-res1.conf
-%%PORTDOCS%%share/doc/bind8/conf/recursive/named.conf.rfc1918-stubs
-%%PORTDOCS%%share/doc/bind8/conf/recursive/pri/127.0.0
-%%PORTDOCS%%share/doc/bind8/conf/recursive/pri/localhost
-%%PORTDOCS%%share/doc/bind8/conf/recursive/root.cache
-%%PORTDOCS%%share/doc/bind8/conf/workstation/named.conf
-%%PORTDOCS%%share/doc/bind8/conf/workstation/pri/127.0.0
-%%PORTDOCS%%share/doc/bind8/conf/workstation/pri/localhost
-%%PORTDOCS%%share/doc/bind8/conf/workstation/root.cache
-%%PORTDOCS%%share/doc/bind8/conf/workstation/stub/README
-%%PORTDOCS%%share/doc/bind8/html/acl.html
-%%PORTDOCS%%share/doc/bind8/html/address_list.html
-%%PORTDOCS%%share/doc/bind8/html/comments.html
-%%PORTDOCS%%share/doc/bind8/html/config.html
-%%PORTDOCS%%share/doc/bind8/html/controls.html
-%%PORTDOCS%%share/doc/bind8/html/docdef.html
-%%PORTDOCS%%share/doc/bind8/html/example.html
-%%PORTDOCS%%share/doc/bind8/html/include.html
-%%PORTDOCS%%share/doc/bind8/html/index.html
-%%PORTDOCS%%share/doc/bind8/html/key.html
-%%PORTDOCS%%share/doc/bind8/html/logging.html
-%%PORTDOCS%%share/doc/bind8/html/master.html
-%%PORTDOCS%%share/doc/bind8/html/options.html
-%%PORTDOCS%%share/doc/bind8/html/server.html
-%%PORTDOCS%%share/doc/bind8/html/trusted-keys.html
-%%PORTDOCS%%share/doc/bind8/html/zone.html
+%%PORTDOCS%%share/doc/bind/CHANGES
+%%PORTDOCS%%share/doc/bind/DNSSEC
+%%PORTDOCS%%share/doc/bind/LICENSE
+%%PORTDOCS%%share/doc/bind/LICENSE_RSA
+%%PORTDOCS%%share/doc/bind/README
+%%PORTDOCS%%share/doc/bind/SUPPORT
+%%PORTDOCS%%share/doc/bind/TODO
+%%PORTDOCS%%share/doc/bind/conf/README
+%%PORTDOCS%%share/doc/bind/conf/recursive/keep-running
+%%PORTDOCS%%share/doc/bind/conf/recursive/named-res1.conf
+%%PORTDOCS%%share/doc/bind/conf/recursive/named.conf.rfc1918-stubs
+%%PORTDOCS%%share/doc/bind/conf/recursive/pri/127.0.0
+%%PORTDOCS%%share/doc/bind/conf/recursive/pri/localhost
+%%PORTDOCS%%share/doc/bind/conf/recursive/root.cache
+%%PORTDOCS%%share/doc/bind/conf/workstation/named.conf
+%%PORTDOCS%%share/doc/bind/conf/workstation/pri/127.0.0
+%%PORTDOCS%%share/doc/bind/conf/workstation/pri/localhost
+%%PORTDOCS%%share/doc/bind/conf/workstation/root.cache
+%%PORTDOCS%%share/doc/bind/conf/workstation/stub/README
+%%PORTDOCS%%share/doc/bind/html/acl.html
+%%PORTDOCS%%share/doc/bind/html/address_list.html
+%%PORTDOCS%%share/doc/bind/html/comments.html
+%%PORTDOCS%%share/doc/bind/html/config.html
+%%PORTDOCS%%share/doc/bind/html/controls.html
+%%PORTDOCS%%share/doc/bind/html/docdef.html
+%%PORTDOCS%%share/doc/bind/html/example.html
+%%PORTDOCS%%share/doc/bind/html/include.html
+%%PORTDOCS%%share/doc/bind/html/index.html
+%%PORTDOCS%%share/doc/bind/html/key.html
+%%PORTDOCS%%share/doc/bind/html/logging.html
+%%PORTDOCS%%share/doc/bind/html/master.html
+%%PORTDOCS%%share/doc/bind/html/options.html
+%%PORTDOCS%%share/doc/bind/html/server.html
+%%PORTDOCS%%share/doc/bind/html/trusted-keys.html
+%%PORTDOCS%%share/doc/bind/html/zone.html
 share/misc/nslookup.help
 @dirrm include/bind/arpa
 @dirrm include/bind/isc
 @dirrm include/bind/sys
 @dirrm include/bind
-%%PORTDOCS%%@dirrm share/doc/bind8/conf/recursive/pri
-%%PORTDOCS%%@dirrm share/doc/bind8/conf/recursive
-%%PORTDOCS%%@dirrm share/doc/bind8/conf/workstation/pri
-%%PORTDOCS%%@dirrm share/doc/bind8/conf/workstation/stub
-%%PORTDOCS%%@dirrm share/doc/bind8/conf/workstation
-%%PORTDOCS%%@dirrm share/doc/bind8/conf
-%%PORTDOCS%%@dirrm share/doc/bind8/html
-%%PORTDOCS%%@dirrm share/doc/bind8/
+%%PORTDOCS%%@dirrm share/doc/bind/conf/recursive/pri
+%%PORTDOCS%%@dirrm share/doc/bind/conf/recursive
+%%PORTDOCS%%@dirrm share/doc/bind/conf/workstation/pri
+%%PORTDOCS%%@dirrm share/doc/bind/conf/workstation/stub
+%%PORTDOCS%%@dirrm share/doc/bind/conf/workstation
+%%PORTDOCS%%@dirrm share/doc/bind/conf
+%%PORTDOCS%%@dirrm share/doc/bind/html
+%%PORTDOCS%%@dirrm share/doc/bind/
diff --git a/net/bind8/Makefile b/net/bind8/Makefile
index 26653e3f0f5c..b0ac451b668e 100644
--- a/net/bind8/Makefile
+++ b/net/bind8/Makefile
@@ -12,6 +12,7 @@
 
 PORTNAME=	bind
 PORTVERSION=	8.3.3
+PORTREVISION=	1
 CATEGORIES?=	net
 MASTER_SITES=	${MASTER_SITE_ISC}
 MASTER_SITE_SUBDIR=	bind/src/${PORTVERSION}
@@ -60,11 +61,11 @@ post-install:
 	cd ${WRKDIR}/doc/man && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} \
 		${MAKEFILE} clean all ${INSTALL_TARGET}
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${PREFIX}/share/doc/bind8/html
-	${INSTALL_DATA} ${WRKDIR}/doc/html/*.html ${PREFIX}/share/doc/bind8/html
-	${CP} -Rp ${WRKDIR}/src/conf ${PREFIX}/share/doc/bind8/
+	@${MKDIR} ${DOCSDIR}/html
+	${INSTALL_DATA} ${WRKDIR}/doc/html/*.html ${DOCSDIR}/html
+	${CP} -Rp ${WRKDIR}/src/conf ${DOCSDIR}
 .for file in CHANGES DNSSEC LICENSE LICENSE_RSA README SUPPORT TODO
-	${INSTALL_DATA} ${WRKDIR}/src/${file} ${PREFIX}/share/doc/bind8
+	${INSTALL_DATA} ${WRKDIR}/src/${file} ${DOCSDIR}
 .endfor
 .endif
 
diff --git a/net/bind8/pkg-plist b/net/bind8/pkg-plist
index 632062c85af8..aa7c8ee9756c 100644
--- a/net/bind8/pkg-plist
+++ b/net/bind8/pkg-plist
@@ -33,51 +33,51 @@ sbin/irpd
 sbin/named
 sbin/named-bootconf
 sbin/ndc
-%%PORTDOCS%%share/doc/bind8/CHANGES
-%%PORTDOCS%%share/doc/bind8/DNSSEC
-%%PORTDOCS%%share/doc/bind8/LICENSE
-%%PORTDOCS%%share/doc/bind8/LICENSE_RSA
-%%PORTDOCS%%share/doc/bind8/README
-%%PORTDOCS%%share/doc/bind8/SUPPORT
-%%PORTDOCS%%share/doc/bind8/TODO
-%%PORTDOCS%%share/doc/bind8/conf/README
-%%PORTDOCS%%share/doc/bind8/conf/recursive/keep-running
-%%PORTDOCS%%share/doc/bind8/conf/recursive/named-res1.conf
-%%PORTDOCS%%share/doc/bind8/conf/recursive/named.conf.rfc1918-stubs
-%%PORTDOCS%%share/doc/bind8/conf/recursive/pri/127.0.0
-%%PORTDOCS%%share/doc/bind8/conf/recursive/pri/localhost
-%%PORTDOCS%%share/doc/bind8/conf/recursive/root.cache
-%%PORTDOCS%%share/doc/bind8/conf/workstation/named.conf
-%%PORTDOCS%%share/doc/bind8/conf/workstation/pri/127.0.0
-%%PORTDOCS%%share/doc/bind8/conf/workstation/pri/localhost
-%%PORTDOCS%%share/doc/bind8/conf/workstation/root.cache
-%%PORTDOCS%%share/doc/bind8/conf/workstation/stub/README
-%%PORTDOCS%%share/doc/bind8/html/acl.html
-%%PORTDOCS%%share/doc/bind8/html/address_list.html
-%%PORTDOCS%%share/doc/bind8/html/comments.html
-%%PORTDOCS%%share/doc/bind8/html/config.html
-%%PORTDOCS%%share/doc/bind8/html/controls.html
-%%PORTDOCS%%share/doc/bind8/html/docdef.html
-%%PORTDOCS%%share/doc/bind8/html/example.html
-%%PORTDOCS%%share/doc/bind8/html/include.html
-%%PORTDOCS%%share/doc/bind8/html/index.html
-%%PORTDOCS%%share/doc/bind8/html/key.html
-%%PORTDOCS%%share/doc/bind8/html/logging.html
-%%PORTDOCS%%share/doc/bind8/html/master.html
-%%PORTDOCS%%share/doc/bind8/html/options.html
-%%PORTDOCS%%share/doc/bind8/html/server.html
-%%PORTDOCS%%share/doc/bind8/html/trusted-keys.html
-%%PORTDOCS%%share/doc/bind8/html/zone.html
+%%PORTDOCS%%share/doc/bind/CHANGES
+%%PORTDOCS%%share/doc/bind/DNSSEC
+%%PORTDOCS%%share/doc/bind/LICENSE
+%%PORTDOCS%%share/doc/bind/LICENSE_RSA
+%%PORTDOCS%%share/doc/bind/README
+%%PORTDOCS%%share/doc/bind/SUPPORT
+%%PORTDOCS%%share/doc/bind/TODO
+%%PORTDOCS%%share/doc/bind/conf/README
+%%PORTDOCS%%share/doc/bind/conf/recursive/keep-running
+%%PORTDOCS%%share/doc/bind/conf/recursive/named-res1.conf
+%%PORTDOCS%%share/doc/bind/conf/recursive/named.conf.rfc1918-stubs
+%%PORTDOCS%%share/doc/bind/conf/recursive/pri/127.0.0
+%%PORTDOCS%%share/doc/bind/conf/recursive/pri/localhost
+%%PORTDOCS%%share/doc/bind/conf/recursive/root.cache
+%%PORTDOCS%%share/doc/bind/conf/workstation/named.conf
+%%PORTDOCS%%share/doc/bind/conf/workstation/pri/127.0.0
+%%PORTDOCS%%share/doc/bind/conf/workstation/pri/localhost
+%%PORTDOCS%%share/doc/bind/conf/workstation/root.cache
+%%PORTDOCS%%share/doc/bind/conf/workstation/stub/README
+%%PORTDOCS%%share/doc/bind/html/acl.html
+%%PORTDOCS%%share/doc/bind/html/address_list.html
+%%PORTDOCS%%share/doc/bind/html/comments.html
+%%PORTDOCS%%share/doc/bind/html/config.html
+%%PORTDOCS%%share/doc/bind/html/controls.html
+%%PORTDOCS%%share/doc/bind/html/docdef.html
+%%PORTDOCS%%share/doc/bind/html/example.html
+%%PORTDOCS%%share/doc/bind/html/include.html
+%%PORTDOCS%%share/doc/bind/html/index.html
+%%PORTDOCS%%share/doc/bind/html/key.html
+%%PORTDOCS%%share/doc/bind/html/logging.html
+%%PORTDOCS%%share/doc/bind/html/master.html
+%%PORTDOCS%%share/doc/bind/html/options.html
+%%PORTDOCS%%share/doc/bind/html/server.html
+%%PORTDOCS%%share/doc/bind/html/trusted-keys.html
+%%PORTDOCS%%share/doc/bind/html/zone.html
 share/misc/nslookup.help
 @dirrm include/bind/arpa
 @dirrm include/bind/isc
 @dirrm include/bind/sys
 @dirrm include/bind
-%%PORTDOCS%%@dirrm share/doc/bind8/conf/recursive/pri
-%%PORTDOCS%%@dirrm share/doc/bind8/conf/recursive
-%%PORTDOCS%%@dirrm share/doc/bind8/conf/workstation/pri
-%%PORTDOCS%%@dirrm share/doc/bind8/conf/workstation/stub
-%%PORTDOCS%%@dirrm share/doc/bind8/conf/workstation
-%%PORTDOCS%%@dirrm share/doc/bind8/conf
-%%PORTDOCS%%@dirrm share/doc/bind8/html
-%%PORTDOCS%%@dirrm share/doc/bind8/
+%%PORTDOCS%%@dirrm share/doc/bind/conf/recursive/pri
+%%PORTDOCS%%@dirrm share/doc/bind/conf/recursive
+%%PORTDOCS%%@dirrm share/doc/bind/conf/workstation/pri
+%%PORTDOCS%%@dirrm share/doc/bind/conf/workstation/stub
+%%PORTDOCS%%@dirrm share/doc/bind/conf/workstation
+%%PORTDOCS%%@dirrm share/doc/bind/conf
+%%PORTDOCS%%@dirrm share/doc/bind/html
+%%PORTDOCS%%@dirrm share/doc/bind/