diff --git a/dns/bind-tools/Makefile b/dns/bind-tools/Makefile
index f72bdf09aea6..f5215feac81c 100644
--- a/dns/bind-tools/Makefile
+++ b/dns/bind-tools/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PORTNAME=	bind-tools
+PKGNAMESUFFIX=	-tools
 
 COMMENT=	Command line tools from BIND: dig, host, and nslookup
 
diff --git a/dns/bind98/Makefile b/dns/bind98/Makefile
index 2bc5e93a0962..2dd06e13630b 100644
--- a/dns/bind98/Makefile
+++ b/dns/bind98/Makefile
@@ -1,11 +1,12 @@
 # $FreeBSD$
 
-PORTNAME=	bind98
+PORTNAME=	bind
 PORTVERSION=	9.8.7
 CATEGORIES=	dns net ipv6
 MASTER_SITES=	${MASTER_SITE_ISC}
 MASTER_SITE_SUBDIR=	bind9/${ISCVERSION}
-DISTNAME=	bind-${ISCVERSION}
+PKGNAMESUFFIX=	98
+DISTNAME=	${PORTNAME}-${ISCVERSION}
 
 MAINTAINER=	mat@FreeBSD.org
 COMMENT=	BIND DNS suite with updated DNSSEC and DNS64
diff --git a/dns/bind99/Makefile b/dns/bind99/Makefile
index 9bd7ba748b6f..25e04dbcc1d5 100644
--- a/dns/bind99/Makefile
+++ b/dns/bind99/Makefile
@@ -1,12 +1,13 @@
 # $FreeBSD$
 
-PORTNAME?=	bind99
+PORTNAME=	bind
 PORTVERSION=	9.9.5
 PORTREVISION=	1
 CATEGORIES=	dns net ipv6
 MASTER_SITES=	${MASTER_SITE_ISC}
 MASTER_SITE_SUBDIR=	bind9/${ISCVERSION}
-DISTNAME=	bind-${ISCVERSION}
+PKGNAMESUFFIX?=	99
+DISTNAME=	${PORTNAME}-${ISCVERSION}
 
 MAINTAINER=	mat@FreeBSD.org
 COMMENT=	BIND DNS suite with updated DNSSEC and DNS64