diff --git a/dns/bind-tools/pkg-plist b/dns/bind-tools/pkg-plist
index e52b15a2013f..326b96d5e2d2 100644
--- a/dns/bind-tools/pkg-plist
+++ b/dns/bind-tools/pkg-plist
@@ -18,19 +18,19 @@ bin/nsec3hash
 bin/nslookup
 bin/nsupdate
 lib/bind-tools/libbind9.so
-lib/bind-tools/libbind9-9.18.27.so
+lib/bind-tools/libbind9-%%DISTVERSION%%.so
 lib/bind-tools/libdns.so
-lib/bind-tools/libdns-9.18.27.so
+lib/bind-tools/libdns-%%DISTVERSION%%.so
 lib/bind-tools/libirs.so
-lib/bind-tools/libirs-9.18.27.so
+lib/bind-tools/libirs-%%DISTVERSION%%.so
 lib/bind-tools/libisc.so
-lib/bind-tools/libisc-9.18.27.so
+lib/bind-tools/libisc-%%DISTVERSION%%.so
 lib/bind-tools/libisccc.so
-lib/bind-tools/libisccc-9.18.27.so
+lib/bind-tools/libisccc-%%DISTVERSION%%.so
 lib/bind-tools/libisccfg.so
-lib/bind-tools/libisccfg-9.18.27.so
+lib/bind-tools/libisccfg-%%DISTVERSION%%.so
 lib/bind-tools/libns.so
-lib/bind-tools/libns-9.18.27.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/bind918/Makefile b/dns/bind918/Makefile
index ae5040d95a5c..a6c5b0afb4a7 100644
--- a/dns/bind918/Makefile
+++ b/dns/bind918/Makefile
@@ -4,10 +4,10 @@ PORTNAME=	bind
 DISTVERSION=	9.18.27
 .if defined(BIND_TOOLS_SLAVE)
 # dns/bind-tools here
-PORTREVISION=	1
+PORTREVISION=	2
 .else
 # dns/bind918 here
-PORTREVISION=	1
+PORTREVISION=	2
 .endif
 CATEGORIES=	dns net
 MASTER_SITES=	ISC/bind9/${DISTVERSION}
@@ -61,6 +61,7 @@ CONFIGURE_ARGS=	--disable-linux-caps \
 		--with-readline=libedit
 CONFIGURE_ENV=	READLINE_CFLAGS="-L${LOCALBASE}/lib"
 ETCDIR=		${PREFIX}/etc/namedb
+PLIST_SUB=	DISTVERSION=${DISTVERSION}
 
 .if defined(BIND_TOOLS_SLAVE)
 EXTRA_PATCHES=		${PATCHDIR}/extrapatch-bind-tools
@@ -207,6 +208,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
@@ -219,6 +221,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/pkg-plist b/dns/bind918/pkg-plist
index 7c461391dea3..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.27.so
+lib/libbind9-%%DISTVERSION%%.so
 lib/libdns.so
-lib/libdns-9.18.27.so
+lib/libdns-%%DISTVERSION%%.so
 lib/libirs.so
-lib/libirs-9.18.27.so
+lib/libirs-%%DISTVERSION%%.so
 lib/libisc.so
-lib/libisc-9.18.27.so
+lib/libisc-%%DISTVERSION%%.so
 lib/libisccc.so
-lib/libisccc-9.18.27.so
+lib/libisccc-%%DISTVERSION%%.so
 lib/libisccfg.so
-lib/libisccfg-9.18.27.so
+lib/libisccfg-%%DISTVERSION%%.so
 lib/libns.so
-lib/libns-9.18.27.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