1 files changed, 16 insertions, 10 deletions

diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile
index 0a7fbc6b14fa..8c1f63a8aaca 100644
--- a/usr.sbin/Makefile
+++ b/usr.sbin/Makefile
@@ -36,6 +36,8 @@ SUBDIR=	ac \
 	devinfo \
 	digictl \
 	diskinfo \
+	${_dnssec-keygen} \
+	${_dnssec-signzone} \
 	${_editmap} \
 	edquota \
 	${_eeprom} \
@@ -93,8 +95,8 @@ SUBDIR=	ac \
 	mtree \
 	${_named} \
 	${_named.reload} \
-	${_named.restart} \
-	${_ndc} \
+	${_named-checkconf} \
+	${_named-checkzone} \
 	${_ndiscvt} \
 	ndp \
 	newsyslog \
@@ -102,8 +104,6 @@ SUBDIR=	ac \
 	ngctl \
 	nghook \
 	nologin \
-	${_nslookup} \
-	${_nsupdate} \
 	ntp \
 	${_ofwdump} \
 	${_pccard} \
@@ -128,6 +128,8 @@ SUBDIR=	ac \
 	repquota \
 	${_rip6query} \
 	rmt \
+	${_rndc} \
+	${_rndc-confgen} \
 	${_route6d} \
 	rpcbind \
 	rpc.lockd \
@@ -190,12 +192,16 @@ _atm=		atm
 .endif
 
 .if !defined(NO_BIND)
-_named=		named
-_named.reload=	named.reload
-_named.restart=	named.restart
-_ndc=		ndc
-_nslookup=	nslookup
-_nsupdate=	nsupdate
+.if !defined(NOCRYPT)
+_dnssec-keygen=		dnssec-keygen
+_dnssec-signzone=	dnssec-signzone
+.endif
+_named=			named
+_named.reload=		named.reload
+_named-checkconf=	named-checkconf
+_named-checkzone=	named-checkzone
+_rndc=			rndc
+_rndc-confgen=		rndc-confgen
 .endif
 
 .if !defined(NO_BLUETOOTH)