diff --git a/usr.bin/dig/Makefile b/usr.bin/dig/Makefile
index 4ff062e06ade..8faa06ae3329 100644
--- a/usr.bin/dig/Makefile
+++ b/usr.bin/dig/Makefile
@@ -1,10 +1,10 @@
-# $Id$
+# $Id: Makefile,v 1.4 1997/02/22 19:54:49 peter Exp $
 
 .include "${.CURDIR}/../../usr.sbin/named/Makefile.inc"
 
-.PATH:	${BIND_DIR}/tools
-.PATH:	${BIND_DIR}/tools/nslookup
-.PATH:	${BIND_DIR}/man
+.PATH:	${BIND_DIR}/bin/dig
+.PATH:	${BIND_DIR}/bin/nslookup
+.PATH:	${BIND_DIR}/doc/man
 
 PROG=	dig
 SRCS=	dig.c list.c subr.c debug.c send.c
diff --git a/usr.bin/dnsquery/Makefile b/usr.bin/dnsquery/Makefile
index 1be409a5e4df..2486aded5c42 100644
--- a/usr.bin/dnsquery/Makefile
+++ b/usr.bin/dnsquery/Makefile
@@ -1,9 +1,9 @@
-# $Id$
+# $Id: Makefile,v 1.4 1997/02/22 19:54:50 peter Exp $
 
 .include "${.CURDIR}/../../usr.sbin/named/Makefile.inc"
 
-.PATH:	${BIND_DIR}/tools
-.PATH:	${BIND_DIR}/man
+.PATH:	${BIND_DIR}/bin/dnsquery
+.PATH:	${BIND_DIR}/doc/man
 
 PROG=	dnsquery
 
diff --git a/usr.bin/host/Makefile b/usr.bin/host/Makefile
index ebccefa2aa19..70a87aa51c52 100644
--- a/usr.bin/host/Makefile
+++ b/usr.bin/host/Makefile
@@ -1,9 +1,9 @@
-# $Id$
+# $Id: Makefile,v 1.4 1997/02/22 19:55:08 peter Exp $
 
 .include "${.CURDIR}/../../usr.sbin/named/Makefile.inc"
 
-.PATH:	${BIND_DIR}/tools
-.PATH:	${BIND_DIR}/man
+.PATH:	${BIND_DIR}/bin/host
+.PATH:	${BIND_DIR}/doc/man
 
 PROG=	host
 
diff --git a/usr.sbin/nslookup/Makefile b/usr.sbin/nslookup/Makefile
index d65edfd1d871..4b95df3ee398 100644
--- a/usr.sbin/nslookup/Makefile
+++ b/usr.sbin/nslookup/Makefile
@@ -1,22 +1,23 @@
-# $Id$
+# $Id: Makefile,v 1.5 1997/02/22 16:08:30 peter Exp $
 
 .include "${.CURDIR}/../named/Makefile.inc"
 
-.PATH:	${BIND_DIR}/tools/nslookup
-.PATH:	${BIND_DIR}/man
+.PATH:	${BIND_DIR}/bin/nslookup
+.PATH:	${BIND_DIR}/doc/man
 
 PROG=	nslookup
 SRCS=	main.c getinfo.c debug.c send.c skip.c list.c subr.c commands.c
 MAN8=	nslookup.8
 
-LDADD=	-ll
-DPADD=	${LIBL}
+CFLAGS+=-D_PATH_HELPFILE=\"${DESTHELP}/nslookup.help\"
+LDADD+=	-ll
+DPADD+=	${LIBL}
 
 CLEANFILES+= commands.c lex.yy.c lex.yy.o
 
 beforeinstall:
 	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 \
-		${BIND_DIR}/tools/nslookup/nslookup.help \
-		${DESTDIR}/usr/share/misc/nslookup.help
+		${BIND_DIR}/bin/nslookup/nslookup.help \
+		${DESTDIR}${DESTHELP}/nslookup.help
 
 .include <bsd.prog.mk>