5 files changed, 77 insertions, 17 deletions
diff --git a/usr.bin/Makefile b/usr.bin/Makefile
index 1949b11aadcb..d09f4b509d9d 100644
--- a/usr.bin/Makefile
+++ b/usr.bin/Makefile
@@ -44,8 +44,6 @@ SUBDIR=	alias \
 	cut \
 	${_dig} \
 	dirname \
-	${_dnskeygen} \
-	${_dnsquery} \
 	du \
 	ee \
 	elf2aout \
@@ -131,6 +129,8 @@ SUBDIR=	alias \
 	nice \
 	nl \
 	nohup \
+	${_nslookup} \
+	${_nsupdate} \
 	objformat \
 	opieinfo \
 	opiekey \
@@ -231,14 +231,14 @@ _truss=		truss
 .endif
 
 .if !defined(NOATM)
-_atm=		atm
+#_atm=		atm
 .endif
 
 .if !defined(NO_BIND)
 _dig=		dig
-_dnskeygen=	dnskeygen
-_dnsquery=	dnsquery
 _host=		host
+_nslookup=	nslookup
+_nsupdate=	nsupdate
 .endif
 
 .if !defined(NO_BLUETOOTH)
diff --git a/usr.bin/dig/Makefile b/usr.bin/dig/Makefile
index c2c9b2269049..3e45ca566db7 100644
--- a/usr.bin/dig/Makefile
+++ b/usr.bin/dig/Makefile
@@ -1,13 +1,21 @@
 # $FreeBSD$
 
-USE_LIBBIND=	yes
-.include "${.CURDIR}/../../usr.sbin/named/Makefile.inc"
+BIND_DIR=	${.CURDIR}/../../contrib/bind9
+LIB_BIND_DIR=	${.CURDIR}/../../lib/bind
+SRCDIR=		${BIND_DIR}/bin/dig
 
-.PATH:	${BIND_DIR}/bin/dig
-.PATH:	${BIND_DIR}/bin/nslookup
-.PATH:	${BIND_DIR}/doc/man
+.include	"${LIB_BIND_DIR}/config.mk"
 
-PROG=	dig
-SRCS=	dig.c list.c subr.c debug.c send.c
+PROG=		dig
+
+.PATH: ${SRCDIR}
+SRCS+=		dig.c dighost.c
+
+CFLAGS+=	-I${SRCDIR}/include
+
+DPADD+=		${BIND_DPADD}
+LDADD+=		${BIND_LDADD}
+
+MAN=		dig.1
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/host/Makefile b/usr.bin/host/Makefile
index a81d9e7562a4..b4d07ad96455 100644
--- a/usr.bin/host/Makefile
+++ b/usr.bin/host/Makefile
@@ -1,11 +1,21 @@
 # $FreeBSD$
 
-USE_LIBBIND=	yes
-.include "${.CURDIR}/../../usr.sbin/named/Makefile.inc"
+BIND_DIR=	${.CURDIR}/../../contrib/bind9
+LIB_BIND_DIR=	${.CURDIR}/../../lib/bind
+SRCDIR=		${BIND_DIR}/bin/dig
 
-.PATH:	${BIND_DIR}/bin/host
-.PATH:	${BIND_DIR}/doc/man
+.include	"${LIB_BIND_DIR}/config.mk"
 
-PROG=	host
+PROG=		host
+
+.PATH: ${SRCDIR}
+SRCS+=		dighost.c host.c
+
+CFLAGS+=	-I${SRCDIR}/include
+
+DPADD+=		${BIND_DPADD}
+LDADD+=		${BIND_LDADD}
+
+MAN=		host.1
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/nslookup/Makefile b/usr.bin/nslookup/Makefile
new file mode 100644
index 000000000000..a7bf65ef8a16
--- /dev/null
+++ b/usr.bin/nslookup/Makefile
@@ -0,0 +1,21 @@
+# $FreeBSD$
+
+BIND_DIR=	${.CURDIR}/../../contrib/bind9
+LIB_BIND_DIR=	${.CURDIR}/../../lib/bind
+SRCDIR=		${BIND_DIR}/bin/dig
+
+.include	"${LIB_BIND_DIR}/config.mk"
+
+PROG=		nslookup
+
+.PATH: ${SRCDIR}
+SRCS+=		dighost.c nslookup.c
+
+CFLAGS+=	-I${SRCDIR}/include
+
+DPADD+=		${BIND_DPADD}
+LDADD+=		${BIND_LDADD}
+
+MAN=		nslookup.1
+
+.include <bsd.prog.mk>
diff --git a/usr.bin/nsupdate/Makefile b/usr.bin/nsupdate/Makefile
new file mode 100644
index 000000000000..9073c12c2f58
--- /dev/null
+++ b/usr.bin/nsupdate/Makefile
@@ -0,0 +1,21 @@
+# $FreeBSD$
+
+BIND_DIR=	${.CURDIR}/../../contrib/bind9
+LIB_BIND_DIR=	${.CURDIR}/../../lib/bind
+SRCDIR=		${BIND_DIR}/bin/nsupdate
+
+.include	"${LIB_BIND_DIR}/config.mk"
+
+PROG=		nsupdate
+
+.PATH: ${SRCDIR}
+SRCS+=		nsupdate.c
+
+CFLAGS+=	-I${SRCDIR}/include
+
+DPADD+=		${BIND_DPADD}
+LDADD+=		${BIND_LDADD}
+
+MAN=		nsupdate.8
+
+.include <bsd.prog.mk>