diff --git a/dns/bind-tools/pkg-plist b/dns/bind-tools/pkg-plist
index 16f2e4dfa0b8..215ae782f6dd 100644
--- a/dns/bind-tools/pkg-plist
+++ b/dns/bind-tools/pkg-plist
@@ -19,15 +19,15 @@ bin/nsec3hash
 bin/nslookup
 bin/nsupdate
 lib/bind-tools/libdns.so
-lib/bind-tools/libdns-9.20.4.so
+lib/bind-tools/libdns-%%DISTVERSION%%.so
 lib/bind-tools/libisc.so
-lib/bind-tools/libisc-9.20.4.so
+lib/bind-tools/libisc-%%DISTVERSION%%.so
 lib/bind-tools/libisccc.so
-lib/bind-tools/libisccc-9.20.4.so
+lib/bind-tools/libisccc-%%DISTVERSION%%.so
 lib/bind-tools/libisccfg.so
-lib/bind-tools/libisccfg-9.20.4.so
+lib/bind-tools/libisccfg-%%DISTVERSION%%.so
 lib/bind-tools/libns.so
-lib/bind-tools/libns-9.20.4.so
+lib/bind-tools/libns-%%DISTVERSION%%.so
 share/man/man1/arpaname.1.gz
 share/man/man1/delv.1.gz
 share/man/man1/dig.1.gz
diff --git a/dns/bind9-devel/Makefile b/dns/bind9-devel/Makefile
index 50fff6e129fa..e5eff85b87d2 100644
--- a/dns/bind9-devel/Makefile
+++ b/dns/bind9-devel/Makefile
@@ -8,7 +8,7 @@ PORTREVISION=	0
 .else
 # XXX: correct version
 # dns/bind9xx here
-PORTREVISION=	0
+PORTREVISION=	1
 .endif
 CATEGORIES=	dns net
 MASTER_SITES=	ISC/bind9/${DISTVERSION}
@@ -61,6 +61,7 @@ CONFIGURE_ARGS=	--localstatedir=/var \
 		--enable-dnsrps \
 		--with-readline=libedit
 ETCDIR=		${PREFIX}/etc/namedb
+PLIST_SUB=	DISTVERSION=${DISTVERSION}
 
 # FIXME: figure out why build fails if enabled
 CONFIGURE_ARGS+=	--disable-tracing
@@ -211,6 +212,7 @@ post-install:
 	${INSTALL_DATA} ${FILESDIR}/localhost-reverse.db ${STAGEDIR}${ETCDIR}/primary
 	${INSTALL_DATA} ${FILESDIR}/BIND.chroot.dist ${STAGEDIR}${PREFIX}/etc/mtree/BIND.chroot.dist.sample
 	${INSTALL_DATA} ${FILESDIR}/BIND.chroot.local.dist ${STAGEDIR}${PREFIX}/etc/mtree/BIND.chroot.local.dist.sample
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so ${STAGEDIR}${PREFIX}/lib/bind/*.so
 
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}/arm
@@ -222,6 +224,7 @@ do-install:
 	for dir in bin lib doc/man; do \
 		(cd ${INSTALL_WRKSRC}/$$dir && ${SETENV} ${MAKE_ENV} ${FAKEROOT} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET}) ; \
 	done
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/bind-tools/*.so
 	@${RM} -r ${STAGEDIR}${PREFIX}/include
 
 .endif	# BIND_TOOLS_SLAVE
diff --git a/dns/bind918/Makefile b/dns/bind918/Makefile
index 950a1abc4bfa..3d161a873468 100644
--- a/dns/bind918/Makefile
+++ b/dns/bind918/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	bind
 DISTVERSION=	9.18.32
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	dns net
 MASTER_SITES=	ISC/bind9/${DISTVERSION}
 PKGNAMESUFFIX=	918
@@ -46,6 +46,7 @@ CONFIGURE_ARGS=	--disable-linux-caps \
 		--with-readline=libedit
 CONFIGURE_ENV=	READLINE_CFLAGS="-L${LOCALBASE}/lib"
 ETCDIR=		${PREFIX}/etc/namedb
+PLIST_SUB=	DISTVERSION=${DISTVERSION}
 
 USE_RC_SUBR=		named
 SUB_FILES=		named.conf pkg-message
@@ -179,6 +180,7 @@ post-install:
 	${INSTALL_DATA} ${FILESDIR}/localhost-reverse.db ${STAGEDIR}${ETCDIR}/primary
 	${INSTALL_DATA} ${FILESDIR}/BIND.chroot.dist ${STAGEDIR}${PREFIX}/etc/mtree/BIND.chroot.dist.sample
 	${INSTALL_DATA} ${FILESDIR}/BIND.chroot.local.dist ${STAGEDIR}${PREFIX}/etc/mtree/BIND.chroot.local.dist.sample
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so ${STAGEDIR}${PREFIX}/lib/bind/*.so
 
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}/arm
diff --git a/dns/bind918/pkg-plist b/dns/bind918/pkg-plist
index b1a3139e74f9..cc1f5a30c85c 100644
--- a/dns/bind918/pkg-plist
+++ b/dns/bind918/pkg-plist
@@ -240,19 +240,19 @@ include/ns/xfrout.h
 lib/bind/filter-a.so
 lib/bind/filter-aaaa.so
 lib/libbind9.so
-lib/libbind9-9.18.32.so
+lib/libbind9-%%DISTVERSION%%.so
 lib/libdns.so
-lib/libdns-9.18.32.so
+lib/libdns-%%DISTVERSION%%.so
 lib/libirs.so
-lib/libirs-9.18.32.so
+lib/libirs-%%DISTVERSION%%.so
 lib/libisc.so
-lib/libisc-9.18.32.so
+lib/libisc-%%DISTVERSION%%.so
 lib/libisccc.so
-lib/libisccc-9.18.32.so
+lib/libisccc-%%DISTVERSION%%.so
 lib/libisccfg.so
-lib/libisccfg-9.18.32.so
+lib/libisccfg-%%DISTVERSION%%.so
 lib/libns.so
-lib/libns-9.18.32.so
+lib/libns-%%DISTVERSION%%.so
 @comment share/man/man1/arpaname.1.gz
 @comment share/man/man1/delv.1.gz
 @comment share/man/man1/dig.1.gz
diff --git a/dns/bind920/Makefile b/dns/bind920/Makefile
index ac02ff159561..9b787f7a6021 100644
--- a/dns/bind920/Makefile
+++ b/dns/bind920/Makefile
@@ -4,11 +4,11 @@ PORTNAME=	bind
 DISTVERSION=	9.20.4
 .if defined(BIND_TOOLS_SLAVE)
 # dns/bind-tools here
-PORTREVISION=	0
+PORTREVISION=	1
 .else
 # XXX: correct version
 # dns/bind920 here
-PORTREVISION=	0
+PORTREVISION=	1
 .endif
 CATEGORIES=	dns net
 MASTER_SITES=	ISC/bind9/${DISTVERSION}
@@ -62,6 +62,7 @@ CONFIGURE_ARGS=	--localstatedir=/var \
 		--enable-dnsrps \
 		--with-readline=libedit
 ETCDIR=		${PREFIX}/etc/namedb
+PLIST_SUB=	DISTVERSION=${DISTVERSION}
 
 # FIXME: figure out why build fails if enabled
 CONFIGURE_ARGS+=	--disable-tracing
@@ -210,6 +211,7 @@ post-install:
 	${INSTALL_DATA} ${FILESDIR}/localhost-reverse.db ${STAGEDIR}${ETCDIR}/primary
 	${INSTALL_DATA} ${FILESDIR}/BIND.chroot.dist ${STAGEDIR}${PREFIX}/etc/mtree/BIND.chroot.dist.sample
 	${INSTALL_DATA} ${FILESDIR}/BIND.chroot.local.dist ${STAGEDIR}${PREFIX}/etc/mtree/BIND.chroot.local.dist.sample
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so ${STAGEDIR}${PREFIX}/lib/bind/*.so
 
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}/arm
@@ -221,6 +223,7 @@ do-install:
 	for dir in bin lib doc/man; do \
 		(cd ${INSTALL_WRKSRC}/$$dir && ${SETENV} ${MAKE_ENV} ${FAKEROOT} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET}) ; \
 	done
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/bind-tools/*.so
 	@${RM} -r ${STAGEDIR}${PREFIX}/include
 
 .endif	# BIND_TOOLS_SLAVE
diff --git a/dns/bind920/pkg-plist b/dns/bind920/pkg-plist
index 5699193ee047..fec8231bf68d 100644
--- a/dns/bind920/pkg-plist
+++ b/dns/bind920/pkg-plist
@@ -241,15 +241,15 @@ include/ns/update.h
 include/ns/xfrout.h
 lib/bind/filter-a.so
 lib/bind/filter-aaaa.so
-lib/libdns-9.20.4.so
+lib/libdns-%%DISTVERSION%%.so
 lib/libdns.so
-lib/libisc-9.20.4.so
+lib/libisc-%%DISTVERSION%%.so
 lib/libisc.so
-lib/libisccc-9.20.4.so
+lib/libisccc-%%DISTVERSION%%.so
 lib/libisccc.so
-lib/libisccfg-9.20.4.so
+lib/libisccfg-%%DISTVERSION%%.so
 lib/libisccfg.so
-lib/libns-9.20.4.so
+lib/libns-%%DISTVERSION%%.so
 lib/libns.so
 @comment share/man/man1/arpaname.1.gz
 @comment share/man/man1/delv.1.gz