diff --git a/usr.sbin/bad144/Makefile b/usr.sbin/bad144/Makefile
index ecd7e98f96a2..93bd043b4340 100644
--- a/usr.sbin/bad144/Makefile
+++ b/usr.sbin/bad144/Makefile
@@ -1,8 +1,8 @@
 #	from: @(#)Makefile	8.1 (Berkeley) 6/6/93
-#	$Id: Makefile,v 1.3 1994/06/13 22:29:11 mycroft Exp $
+#	$Id: Makefile,v 1.4 1994/12/22 11:32:57 cgd Exp $
 
 PROG=	bad144
-MAN8=	bad144.0
+MAN=	bad144.8
 MANSUBDIR=/i386
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/bootp/bootpd/Makefile b/usr.sbin/bootp/bootpd/Makefile
index fe2d43510306..c7d14741f8f6 100644
--- a/usr.sbin/bootp/bootpd/Makefile
+++ b/usr.sbin/bootp/bootpd/Makefile
@@ -1,5 +1,5 @@
 # bootpd/Makefile
-# $Id: Makefile,v 1.1.1.1 1994/06/27 21:25:49 gwr Exp $
+# $Id: Makefile,v 1.2 1994/12/22 11:33:08 cgd Exp $
 
 PROG=	bootpd
 CFLAGS+= -DETC_ETHERS -DSYSLOG -DDEBUG -DVEND_CMU
@@ -7,8 +7,7 @@ CFLAGS+= -DETC_ETHERS -DSYSLOG -DDEBUG -DVEND_CMU
 SRCS=	bootpd.c dovend.c readfile.c hash.c dumptab.c \
 	 lookup.c getif.c hwaddr.c report.c tzone.c
 
-MAN5=	bootptab.0
-MAN8=	bootpd.0
+MAN=	bootpd.8 bootptab.5
 MLINKS= bootpd.8 bootpgw.8
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/bootpd/Makefile b/usr.sbin/bootpd/Makefile
index fe2d43510306..c7d14741f8f6 100644
--- a/usr.sbin/bootpd/Makefile
+++ b/usr.sbin/bootpd/Makefile
@@ -1,5 +1,5 @@
 # bootpd/Makefile
-# $Id: Makefile,v 1.1.1.1 1994/06/27 21:25:49 gwr Exp $
+# $Id: Makefile,v 1.2 1994/12/22 11:33:08 cgd Exp $
 
 PROG=	bootpd
 CFLAGS+= -DETC_ETHERS -DSYSLOG -DDEBUG -DVEND_CMU
@@ -7,8 +7,7 @@ CFLAGS+= -DETC_ETHERS -DSYSLOG -DDEBUG -DVEND_CMU
 SRCS=	bootpd.c dovend.c readfile.c hash.c dumptab.c \
 	 lookup.c getif.c hwaddr.c report.c tzone.c
 
-MAN5=	bootptab.0
-MAN8=	bootpd.0
+MAN=	bootpd.8 bootptab.5
 MLINKS= bootpd.8 bootpgw.8
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/bootpef/Makefile b/usr.sbin/bootpef/Makefile
index dccbc69694f9..9ff96713ab49 100644
--- a/usr.sbin/bootpef/Makefile
+++ b/usr.sbin/bootpef/Makefile
@@ -1,5 +1,5 @@
 # bootpef/Makefile
-# $Id: Makefile,v 1.2 1994/06/27 21:31:21 gwr Exp $
+# $Id: Makefile,v 1.3 1994/12/22 11:33:12 cgd Exp $
 
 PROG=	bootpef
 SRCDIR= ${.CURDIR}/../bootpd
@@ -9,7 +9,7 @@ CFLAGS+= -DETC_ETHERS -DDEBUG -I${SRCDIR}
 SRCS=	bootpef.c dovend.c readfile.c hash.c dumptab.c \
 	 lookup.c hwaddr.c report.c tzone.c
 
-MAN8=	bootpef.0
+MAN=	bootpef.8
 
 .include <bsd.prog.mk>
 
diff --git a/usr.sbin/bootpgw/Makefile b/usr.sbin/bootpgw/Makefile
index 677868d5dfb6..8d13d54070fb 100644
--- a/usr.sbin/bootpgw/Makefile
+++ b/usr.sbin/bootpgw/Makefile
@@ -1,5 +1,5 @@
 # bootpgw/Makefile
-# $Id: Makefile,v 1.1.1.1 1994/06/27 21:29:46 gwr Exp $
+# $Id: Makefile,v 1.2 1994/12/22 11:33:16 cgd Exp $
 
 PROG=	bootpgw
 SRCDIR= ${.CURDIR}/../bootpd
@@ -8,7 +8,7 @@ CFLAGS+= -DSYSLOG -DDEBUG -I${SRCDIR}
 
 SRCS=	bootpgw.c getif.c hwaddr.c report.c
 
-MAN8=
+NOMAN=
 
 .include <bsd.prog.mk>
 
diff --git a/usr.sbin/bootptest/Makefile b/usr.sbin/bootptest/Makefile
index c47790ca2d24..d3593bc86e4e 100644
--- a/usr.sbin/bootptest/Makefile
+++ b/usr.sbin/bootptest/Makefile
@@ -1,5 +1,5 @@
 # bootptest/Makefile
-# $Id: Makefile,v 1.3 1994/08/22 22:19:04 gwr Exp $
+# $Id: Makefile,v 1.4 1994/12/22 11:33:18 cgd Exp $
 
 PROG=	bootptest
 SRCDIR= ${.CURDIR}/../bootpd
@@ -8,7 +8,7 @@ CFLAGS+= -I${SRCDIR}
 
 SRCS=	bootptest.c print-bootp.c getif.c getether.c report.c
 
-MAN8=	bootptest.0
+MAN=	bootptest.8
 
 .include <bsd.prog.mk>
 
diff --git a/usr.sbin/catman/Makefile b/usr.sbin/catman/Makefile
index 217ee6700272..1f08fcb3980a 100644
--- a/usr.sbin/catman/Makefile
+++ b/usr.sbin/catman/Makefile
@@ -1,7 +1,7 @@
-#	$Id: Makefile,v 1.2 1993/08/02 17:54:57 mycroft Exp $
+#	$Id: Makefile,v 1.3 1994/12/22 11:33:22 cgd Exp $
 
 BINDIR=		/usr/sbin
 PROG=		catman
-MAN8=		catman.0
+MAN=		catman.8
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/chown/Makefile b/usr.sbin/chown/Makefile
index 9984445b04b2..0a2512fc3057 100644
--- a/usr.sbin/chown/Makefile
+++ b/usr.sbin/chown/Makefile
@@ -1,10 +1,9 @@
 #	from: @(#)Makefile	8.1 (Berkeley) 6/6/93
-#	$Id: Makefile,v 1.4 1994/06/18 20:55:54 cgd Exp $
+#	$Id: Makefile,v 1.5 1994/12/22 11:33:27 cgd Exp $
 
 PROG=	chown
 CFLAGS+=-DSUPPORT_DOT
-MAN1=	chgrp.0
-MAN8=	chown.0
+MAN=	chgrp.1 chown.8
 LINKS=	${BINDIR}/chown /usr/bin/chgrp
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/chroot/Makefile b/usr.sbin/chroot/Makefile
index 9c0b77b375b4..05ed84cc17f2 100644
--- a/usr.sbin/chroot/Makefile
+++ b/usr.sbin/chroot/Makefile
@@ -1,7 +1,7 @@
 #	from: @(#)Makefile	5.3 (Berkeley) 5/11/90
-#	$Id: Makefile,v 1.2 1993/07/30 22:13:32 mycroft Exp $
+#	$Id: Makefile,v 1.3 1994/12/22 11:33:31 cgd Exp $
 
 PROG=	chroot
-MAN8=	chroot.0
+MAN=	chroot.8
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/config.new/Makefile b/usr.sbin/config.new/Makefile
index 15a3c3d13a50..fa2563283a89 100644
--- a/usr.sbin/config.new/Makefile
+++ b/usr.sbin/config.new/Makefile
@@ -1,5 +1,5 @@
 #	from: @(#)Makefile	8.2 (Berkeley) 4/19/94
-#	$Id: Makefile,v 1.10 1994/12/11 22:29:40 mycroft Exp $
+#	$Id: Makefile,v 1.11 1994/12/22 11:33:48 cgd Exp $
 
 PROG=	config.new
 BINDIR=	/usr/sbin
@@ -9,7 +9,7 @@ CFLAGS+=-I${.CURDIR} -I.
 LDADD+=	-ll
 DPADD+=	${LIBL}
 CLEANFILES=gram.c scan.c y.tab.h
-MAN8=	config.new.0
+MAN=	config.new.8
 
 .include <bsd.prog.mk>
 
diff --git a/usr.sbin/config.old/Makefile b/usr.sbin/config.old/Makefile
index 400f25f524cc..901ae678c419 100644
--- a/usr.sbin/config.old/Makefile
+++ b/usr.sbin/config.old/Makefile
@@ -1,12 +1,12 @@
 #	from: @(#)Makefile	5.12 (Berkeley) 1/16/91
-#	$Id: Makefile,v 1.8 1994/12/11 22:29:42 mycroft Exp $
+#	$Id: Makefile,v 1.9 1994/12/22 11:33:37 cgd Exp $
 
 PROG=	config
 BINDIR=	/usr/sbin
 CFLAGS+=-I. -I${.CURDIR}
 SRCS=	config.c main.c lang.c mkioconf.c mkmakefile.c mkglue.c mkheaders.c \
 	mkswapconf.c specfile.c
-MAN8=	config.0
+MAN=	config.8
 LDADD+=	-ll
 DPADD+=	${LIBL}
 CLEANFILES+=y.tab.h lang.c config.c y.tab.c
diff --git a/usr.sbin/config/Makefile b/usr.sbin/config/Makefile
index 400f25f524cc..901ae678c419 100644
--- a/usr.sbin/config/Makefile
+++ b/usr.sbin/config/Makefile
@@ -1,12 +1,12 @@
 #	from: @(#)Makefile	5.12 (Berkeley) 1/16/91
-#	$Id: Makefile,v 1.8 1994/12/11 22:29:42 mycroft Exp $
+#	$Id: Makefile,v 1.9 1994/12/22 11:33:37 cgd Exp $
 
 PROG=	config
 BINDIR=	/usr/sbin
 CFLAGS+=-I. -I${.CURDIR}
 SRCS=	config.c main.c lang.c mkioconf.c mkmakefile.c mkglue.c mkheaders.c \
 	mkswapconf.c specfile.c
-MAN8=	config.0
+MAN=	config.8
 LDADD+=	-ll
 DPADD+=	${LIBL}
 CLEANFILES+=y.tab.h lang.c config.c y.tab.c
diff --git a/usr.sbin/cron/Makefile b/usr.sbin/cron/Makefile
index 0941d0654b0d..fde22d30f735 100644
--- a/usr.sbin/cron/Makefile
+++ b/usr.sbin/cron/Makefile
@@ -1,9 +1,9 @@
-#	$Id: Makefile,v 1.4 1994/01/20 02:56:55 jtc Exp $
+#	$Id: Makefile,v 1.5 1994/12/22 11:33:57 cgd Exp $
 
 PROG=	cron
 SRCS=	cron.c database.c user.c entry.c job.c do_command.c \
 	misc.c env.c popen.c 
 CFLAGS+=-I${.CURDIR}
-MAN8=	cron.0
+MAN=	cron.8
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/dbsym/Makefile b/usr.sbin/dbsym/Makefile
index 3e63ea80fcad..06617846c9e3 100644
--- a/usr.sbin/dbsym/Makefile
+++ b/usr.sbin/dbsym/Makefile
@@ -1,6 +1,6 @@
-#	$Id: Makefile,v 1.3 1994/08/25 20:40:28 gwr Exp $
+#	$Id: Makefile,v 1.4 1994/12/22 11:34:02 cgd Exp $
 
 PROG=dbsym
-MAN8=dbsym.0
+MAN=dbsym.8
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/dev_mkdb/Makefile b/usr.sbin/dev_mkdb/Makefile
index 283f76e2b7e4..6820e68f837b 100644
--- a/usr.sbin/dev_mkdb/Makefile
+++ b/usr.sbin/dev_mkdb/Makefile
@@ -1,7 +1,7 @@
 #	from: @(#)Makefile	5.1 (Berkeley) 2/12/91
-#	$Id: Makefile,v 1.2 1993/07/30 22:13:23 mycroft Exp $
+#	$Id: Makefile,v 1.3 1994/12/22 11:34:08 cgd Exp $
 
 PROG=	dev_mkdb
-MAN8=	dev_mkdb.0
+MAN=	dev_mkdb.8
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/diskpart/Makefile b/usr.sbin/diskpart/Makefile
index 87c5cce83c5d..d95ca36ab8a4 100644
--- a/usr.sbin/diskpart/Makefile
+++ b/usr.sbin/diskpart/Makefile
@@ -1,7 +1,7 @@
 #	from: @(#)Makefile	5.3 (Berkeley) 5/11/90
-#	$Id: Makefile,v 1.2 1993/07/30 22:13:20 mycroft Exp $
+#	$Id: Makefile,v 1.3 1994/12/22 11:34:14 cgd Exp $
 
 PROG=	diskpart
-MAN8=	diskpart.0
+MAN=	diskpart.8
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/edquota/Makefile b/usr.sbin/edquota/Makefile
index 9c0b4e72ceaf..8102de974d5d 100644
--- a/usr.sbin/edquota/Makefile
+++ b/usr.sbin/edquota/Makefile
@@ -1,7 +1,7 @@
 #	from: @(#)Makefile	8.1 (Berkeley) 6/6/93
-#	$Id: Makefile,v 1.3 1994/06/13 21:55:00 mycroft Exp $
+#	$Id: Makefile,v 1.4 1994/12/22 11:34:19 cgd Exp $
 
 PROG=	edquota
-MAN8=	edquota.0
+MAN=	edquota.8
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/gettable/Makefile b/usr.sbin/gettable/Makefile
index 321ccc1a9fb2..4009b37e26ac 100644
--- a/usr.sbin/gettable/Makefile
+++ b/usr.sbin/gettable/Makefile
@@ -1,7 +1,7 @@
 #	from: @(#)Makefile	5.3 (Berkeley) 5/11/90
-#	$Id: Makefile,v 1.2 1993/07/30 22:13:07 mycroft Exp $
+#	$Id: Makefile,v 1.3 1994/12/22 11:34:26 cgd Exp $
 
 PROG=	gettable
-MAN8=	gettable.0
+MAN=	gettable.8
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/htable/Makefile b/usr.sbin/htable/Makefile
index f6e617492277..52dc849f1271 100644
--- a/usr.sbin/htable/Makefile
+++ b/usr.sbin/htable/Makefile
@@ -1,9 +1,9 @@
 #	from: @(#)Makefile	5.12 (Berkeley) 7/1/90
-#	$Id: Makefile,v 1.3 1993/12/02 18:18:49 jtc Exp $
+#	$Id: Makefile,v 1.4 1994/12/22 11:34:35 cgd Exp $
 
 PROG=	htable
 SRCS=	htable.c parse.c scan.c
-MAN8=	htable.0
+MAN=	htable.8
 CFLAGS+=-I. -I${.CURDIR}
 LDADD+=	-ll
 DPADD+=	${LIBL}
diff --git a/usr.sbin/inetd/Makefile b/usr.sbin/inetd/Makefile
index eedcc86271c2..eaab85b2f46d 100644
--- a/usr.sbin/inetd/Makefile
+++ b/usr.sbin/inetd/Makefile
@@ -1,8 +1,8 @@
 #	from: @(#)Makefile	5.5 (Berkeley) 6/29/90
-#	$Id: Makefile,v 1.5 1994/01/28 00:52:03 cgd Exp $
+#	$Id: Makefile,v 1.6 1994/12/22 11:34:42 cgd Exp $
 
 PROG=	inetd
-MAN8=	inetd.0
+MAN=	inetd.8
 MLINKS=	inetd.8 inetd.5
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/iostat/Makefile b/usr.sbin/iostat/Makefile
index b3b04bbf9a2b..20ebf133c8f0 100644
--- a/usr.sbin/iostat/Makefile
+++ b/usr.sbin/iostat/Makefile
@@ -5,7 +5,7 @@ PROG=	iostat
 CFLAGS+=-D${MACHINE} -I${.CURDIR}/../../sys/arch
 .endif
 CFLAGS+=-I${.CURDIR}/../../usr.bin/vmstat
-MAN8=	iostat.0
+MAN=	iostat.8
 DPADD=	${LIBKVM}
 LDADD=	-lkvm
 BINGRP=	kmem
diff --git a/usr.sbin/iteconfig/Makefile b/usr.sbin/iteconfig/Makefile
index d006f3695fe1..54900666790f 100644
--- a/usr.sbin/iteconfig/Makefile
+++ b/usr.sbin/iteconfig/Makefile
@@ -1,7 +1,7 @@
-#   $Id: Makefile,v 1.1 1994/04/05 01:56:43 chopps Exp $	
+#   $Id: Makefile,v 1.2 1994/12/22 11:34:57 cgd Exp $	
 
 PROG=iteconfig
-MAN8=iteconfig.0
+MAN=iteconfig.8
 CFLAGS+=-I${.CURDIR}/../../sys/arch
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/kgmon/Makefile b/usr.sbin/kgmon/Makefile
index 7d134dc01f0b..845b7a1c7afc 100644
--- a/usr.sbin/kgmon/Makefile
+++ b/usr.sbin/kgmon/Makefile
@@ -1,8 +1,8 @@
 #	from: @(#)Makefile	8.1 (Berkeley) 6/6/93
-#	$Id: Makefile,v 1.5 1994/06/11 08:04:23 mycroft Exp $
+#	$Id: Makefile,v 1.6 1994/12/22 11:35:06 cgd Exp $
 
 PROG=	kgmon
-MAN8=	kgmon.0
+MAN=	kgmon.8
 DPADD=	${LIBKVM}
 LDADD=	-lkvm
 #
diff --git a/usr.sbin/kvm_mkdb/Makefile b/usr.sbin/kvm_mkdb/Makefile
index 33a5636e103d..9fd5affe5234 100644
--- a/usr.sbin/kvm_mkdb/Makefile
+++ b/usr.sbin/kvm_mkdb/Makefile
@@ -1,8 +1,8 @@
 #	from: @(#)Makefile	8.1 (Berkeley) 6/6/93
-#	$Id: Makefile,v 1.4 1994/06/11 07:57:37 mycroft Exp $
+#	$Id: Makefile,v 1.5 1994/12/22 11:35:18 cgd Exp $
 
 PROG=	kvm_mkdb
 SRCS=	kvm_mkdb.c nlist.c testdb.c
-MAN8=	kvm_mkdb.0
+MAN=	kvm_mkdb.8
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/lpr/lpc/Makefile b/usr.sbin/lpr/lpc/Makefile
index 10a3d6964d6c..c6cefebe6981 100644
--- a/usr.sbin/lpr/lpc/Makefile
+++ b/usr.sbin/lpr/lpc/Makefile
@@ -2,7 +2,7 @@
 
 PROG=	lpc
 CFLAGS+=-I${.CURDIR}/../common_source
-MAN8=	lpc.0
+MAN=	lpc.8
 SRCS=	lpc.c cmds.c cmdtab.c startdaemon.c common.c
 BINGRP=	daemon
 BINMODE=2555
diff --git a/usr.sbin/lpr/lpd/Makefile b/usr.sbin/lpr/lpd/Makefile
index da95bacac731..deeab18ac772 100644
--- a/usr.sbin/lpr/lpd/Makefile
+++ b/usr.sbin/lpr/lpd/Makefile
@@ -2,7 +2,7 @@
 
 PROG=	lpd
 CFLAGS+=-I${.CURDIR}/../common_source
-MAN8=	lpd.0
+MAN=	lpd.8
 SRCS=	lpd.c printjob.c recvjob.c displayq.c rmjob.c startdaemon.c \
 	lpdchar.c common.c
 .PATH:	${.CURDIR}/../common_source
diff --git a/usr.sbin/lpr/pac/Makefile b/usr.sbin/lpr/pac/Makefile
index 70cea8994c77..e3fb65a3ee0a 100644
--- a/usr.sbin/lpr/pac/Makefile
+++ b/usr.sbin/lpr/pac/Makefile
@@ -2,7 +2,7 @@
 
 PROG=	pac
 CFLAGS+=-I${.CURDIR}/../common_source
-MAN8=	pac.0
+MAN=	pac.8
 SRCS=	pac.c common.c
 .PATH:	${.CURDIR}/../common_source
 
diff --git a/usr.sbin/mrouted/Makefile b/usr.sbin/mrouted/Makefile
index 7d6d43fc79db..925d8717264c 100644
--- a/usr.sbin/mrouted/Makefile
+++ b/usr.sbin/mrouted/Makefile
@@ -1,9 +1,9 @@
 #	from: Id: Makefile,v 1.5 1993/06/24 05:11:16 deering Exp
-#	$Id: Makefile,v 1.1 1994/01/11 20:15:47 brezak Exp $
+#	$Id: Makefile,v 1.2 1994/12/22 11:36:22 cgd Exp $
 
 PROG=	mrouted
 SRCS=	igmp.c inet.c kern.c config.c main.c route.c vif.c
-MAN8=	mrouted.0
+MAN=	mrouted.8
 
 SUBDIR=	mrinfo map-mbone
 
diff --git a/usr.sbin/mtree/Makefile b/usr.sbin/mtree/Makefile
index 652f83c8b1a5..6b3e06243e3d 100644
--- a/usr.sbin/mtree/Makefile
+++ b/usr.sbin/mtree/Makefile
@@ -1,9 +1,9 @@
 #	from: @(#)Makefile	5.6 (Berkeley) 2/19/92
-#	$Id: Makefile,v 1.5 1994/03/19 07:55:56 cgd Exp $
+#	$Id: Makefile,v 1.6 1994/12/22 11:36:40 cgd Exp $
 
 PROG=	mtree
 #CFLAGS+=-DDEBUG
-MAN8=	mtree.0
+MAN=	mtree.8
 SRCS=	compare.c crc.c create.c misc.c mtree.c spec.c verify.c
 .PATH:	${.CURDIR}/../../usr.bin/cksum
 
diff --git a/usr.sbin/named/Makefile b/usr.sbin/named/Makefile
index c4d8a7d1af4c..b64f4024c3f9 100644
--- a/usr.sbin/named/Makefile
+++ b/usr.sbin/named/Makefile
@@ -1,10 +1,10 @@
 #	from: @(#)Makefile	5.8 (Berkeley) 7/28/90
-#	$Id: Makefile,v 1.5 1994/01/28 00:56:10 cgd Exp $
+#	$Id: Makefile,v 1.6 1994/12/22 11:36:58 cgd Exp $
 
 ### -DALLOW_T_UNSPEC -Dmalloc=rt_malloc -Dfree=rt_free
 ### ALLOC=storage.o
 PROG=	named
-MAN8=	named.0
+MAN=	named.8
 CFLAGS+=-DDEBUG -DSTATS
 SRCS=	db_dump.c db_glue.c db_load.c db_lookup.c db_reload.c db_save.c \
 	db_update.c ns_forw.c ns_init.c ns_main.c ns_maint.c ns_req.c \
diff --git a/usr.sbin/named/tools/nslookup/Makefile b/usr.sbin/named/tools/nslookup/Makefile
index fa05f4ef1a11..31e74289d6c2 100644
--- a/usr.sbin/named/tools/nslookup/Makefile
+++ b/usr.sbin/named/tools/nslookup/Makefile
@@ -1,10 +1,10 @@
 #	from: @(#)Makefile	5.23 (Berkeley) 6/24/90
-#	$Id: Makefile,v 1.3 1993/12/02 18:18:59 jtc Exp $
+#	$Id: Makefile,v 1.4 1994/12/22 11:37:21 cgd Exp $
 
 PROG=	nslookup
 SRCS=	main.c getinfo.c debug.c send.c skip.c list.c subr.c
 OBJS+=	commands.o
-MAN8=	nslookup.0
+MAN=	nslookup.8
 LFLAGS=	-I
 CFLAGS+=-I${.CURDIR}
 LDADD=	-ll
diff --git a/usr.sbin/portmap/Makefile b/usr.sbin/portmap/Makefile
index 415c9c72e3e4..c854538202fe 100644
--- a/usr.sbin/portmap/Makefile
+++ b/usr.sbin/portmap/Makefile
@@ -1,7 +1,7 @@
 #	from: @(#)Makefile	5.2 (Berkeley) 9/27/90
-#	$Id: Makefile,v 1.4 1994/01/28 00:53:00 cgd Exp $
+#	$Id: Makefile,v 1.5 1994/12/22 11:37:41 cgd Exp $
 
 PROG=	portmap
-MAN8=	portmap.0
+MAN=	portmap.8
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/pppd/Makefile b/usr.sbin/pppd/Makefile
index 294a34e1c4d6..8caef1878e23 100644
--- a/usr.sbin/pppd/Makefile
+++ b/usr.sbin/pppd/Makefile
@@ -1,9 +1,9 @@
-#	$Id: Makefile,v 1.6 1994/05/08 12:16:10 paulus Exp $
+#	$Id: Makefile,v 1.7 1994/12/22 11:38:02 cgd Exp $
 
 PROG=	pppd
 SRCS=	main.c magic.c fsm.c lcp.c ipcp.c upap.c chap.c md5.c \
 	auth.c options.c lock.c sys-bsd.c
-MAN8=	pppd.0
+MAN=	pppd.8
 SUBDIR=	pppstats chat
 BINMODE=4555
 BINOWN=	root
diff --git a/usr.sbin/pppd/chat/Makefile b/usr.sbin/pppd/chat/Makefile
index 61ff127724ea..3f1da9cfdb8e 100644
--- a/usr.sbin/pppd/chat/Makefile
+++ b/usr.sbin/pppd/chat/Makefile
@@ -1,8 +1,8 @@
-#	$Id: Makefile,v 1.2 1994/05/30 01:38:57 paulus Exp $
+#	$Id: Makefile,v 1.3 1994/12/22 11:38:20 cgd Exp $
 
 PROG=	chat
 SRCS=	chat.c
-MAN8=	chat.0
+MAN=	chat.8
 BINDIR=	/usr/sbin
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/pppd/pppd/Makefile b/usr.sbin/pppd/pppd/Makefile
index 294a34e1c4d6..8caef1878e23 100644
--- a/usr.sbin/pppd/pppd/Makefile
+++ b/usr.sbin/pppd/pppd/Makefile
@@ -1,9 +1,9 @@
-#	$Id: Makefile,v 1.6 1994/05/08 12:16:10 paulus Exp $
+#	$Id: Makefile,v 1.7 1994/12/22 11:38:02 cgd Exp $
 
 PROG=	pppd
 SRCS=	main.c magic.c fsm.c lcp.c ipcp.c upap.c chap.c md5.c \
 	auth.c options.c lock.c sys-bsd.c
-MAN8=	pppd.0
+MAN=	pppd.8
 SUBDIR=	pppstats chat
 BINMODE=4555
 BINOWN=	root
diff --git a/usr.sbin/pppd/pppstats/Makefile b/usr.sbin/pppd/pppstats/Makefile
index 3396573fb145..bfe6da68309e 100644
--- a/usr.sbin/pppd/pppstats/Makefile
+++ b/usr.sbin/pppd/pppstats/Makefile
@@ -1,11 +1,11 @@
-#	$Id: Makefile,v 1.6 1994/11/15 07:20:52 glass Exp $
+#	$Id: Makefile,v 1.7 1994/12/22 11:38:31 cgd Exp $
 
 PROG=	pppstats
 SRCS=	pppstats.c
 CFLAGS+= -DPPP
 LDADD=	-lkvm
 DPADD=	${LIBKVM}
-MAN8=	pppstats.0
+MAN=	pppstats.8
 MLINKS= pppstats.8 slstats.8
 BINMODE=2555
 BINGRP=	kmem
diff --git a/usr.sbin/pwd_mkdb/Makefile b/usr.sbin/pwd_mkdb/Makefile
index 1a882e372950..a8ad1883108a 100644
--- a/usr.sbin/pwd_mkdb/Makefile
+++ b/usr.sbin/pwd_mkdb/Makefile
@@ -1,9 +1,9 @@
 #	from: @(#)Makefile	8.1 (Berkeley) 6/6/93
-#	$Id: Makefile,v 1.4 1994/08/28 23:32:47 mycroft Exp $
+#	$Id: Makefile,v 1.5 1994/12/22 11:38:49 cgd Exp $
 
 PROG=	pwd_mkdb
 SRCS=	pw_scan.c pwd_mkdb.c getpwent.c
-MAN8=	pwd_mkdb.0
+MAN=	pwd_mkdb.8
 
 .PATH:	${.CURDIR}/../../lib/libc/gen
 
diff --git a/usr.sbin/quot/Makefile b/usr.sbin/quot/Makefile
index e3a257c71c6d..aca581b820d3 100644
--- a/usr.sbin/quot/Makefile
+++ b/usr.sbin/quot/Makefile
@@ -1,6 +1,6 @@
-#	$Id: Makefile,v 1.2 1994/02/11 00:23:34 cgd Exp $
+#	$Id: Makefile,v 1.3 1994/12/22 11:39:03 cgd Exp $
 
 PROG=	quot
-MAN8=	quot.0
+MAN=	quot.8
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/quotaon/Makefile b/usr.sbin/quotaon/Makefile
index 156a21a544c9..59a96da5e4d1 100644
--- a/usr.sbin/quotaon/Makefile
+++ b/usr.sbin/quotaon/Makefile
@@ -1,8 +1,8 @@
 #	from: @(#)Makefile	8.1 (Berkeley) 6/6/93
-#	$Id: Makefile,v 1.3 1994/06/13 22:04:11 mycroft Exp $
+#	$Id: Makefile,v 1.4 1994/12/22 11:39:18 cgd Exp $
 
 PROG=	quotaon
-MAN8=	quotaon.0
+MAN=	quotaon.8
 MLINKS=	quotaon.8 quotaoff.8
 LINKS=	${BINDIR}/quotaon ${BINDIR}/quotaoff
 
diff --git a/usr.sbin/rarpd/Makefile b/usr.sbin/rarpd/Makefile
index f3922e4c47fc..ad9d065dbe99 100644
--- a/usr.sbin/rarpd/Makefile
+++ b/usr.sbin/rarpd/Makefile
@@ -1,10 +1,10 @@
-# @(#) $Id: Makefile,v 1.1 1993/12/16 05:31:05 deraadt Exp $
+# @(#) $Id: Makefile,v 1.2 1994/12/22 11:39:31 cgd Exp $
 
 PROG=	rarpd
 SRCS=	rarpd.c
 
 CFLAGS+=-I${.CURDIR} -DTFTP_DIR=\"/tftpboot\"
 
-MAN8=	rarpd.0
+MAN=	rarpd.8
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/rbootd/Makefile b/usr.sbin/rbootd/Makefile
index b9069c51915f..91e961b36ccd 100644
--- a/usr.sbin/rbootd/Makefile
+++ b/usr.sbin/rbootd/Makefile
@@ -1,8 +1,8 @@
 #	from: @(#)Makefile	8.1 (Berkeley) 6/4/93
-#	$Id: Makefile,v 1.2 1994/01/11 16:41:19 brezak Exp $
+#	$Id: Makefile,v 1.3 1994/12/22 11:39:48 cgd Exp $
 
 PROG=	rbootd
 SRCS=	bpf.c conf.c parseconf.c rbootd.c rmpproto.c utils.c
-MAN8=	rbootd.0
+MAN=	rbootd.8
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/rdate/Makefile b/usr.sbin/rdate/Makefile
index 22309935de0f..27413e880c69 100644
--- a/usr.sbin/rdate/Makefile
+++ b/usr.sbin/rdate/Makefile
@@ -1,8 +1,8 @@
-# @(#) $Id: Makefile,v 1.1 1994/06/02 22:54:59 deraadt Exp $
+# @(#) $Id: Makefile,v 1.2 1994/12/22 11:40:02 cgd Exp $
 
 PROG=	rdate
 SRCS=	rdate.c
 
-MAN8=	rdate.0
+MAN=	rdate.8
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/repquota/Makefile b/usr.sbin/repquota/Makefile
index e87b263a45b4..f777b2972cf5 100644
--- a/usr.sbin/repquota/Makefile
+++ b/usr.sbin/repquota/Makefile
@@ -1,7 +1,7 @@
 #	from: @(#)Makefile	8.1 (Berkeley) 6/6/93
-#	$Id: Makefile,v 1.3 1994/06/13 22:07:21 mycroft Exp $
+#	$Id: Makefile,v 1.4 1994/12/22 11:40:19 cgd Exp $
 
 PROG=	repquota
-MAN8=	repquota.0
+MAN=	repquota.8
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/rmt/Makefile b/usr.sbin/rmt/Makefile
index d2cb764e0bbb..231ee5e04806 100644
--- a/usr.sbin/rmt/Makefile
+++ b/usr.sbin/rmt/Makefile
@@ -1,7 +1,7 @@
 #	from: @(#)Makefile	5.4 (Berkeley) 5/11/90
-#	$Id: Makefile,v 1.2 1993/07/30 21:40:59 mycroft Exp $
+#	$Id: Makefile,v 1.3 1994/12/22 11:40:32 cgd Exp $
 
 PROG=	rmt
-MAN8=	rmt.0
+MAN=	rmt.8
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/rpc.bootparamd/Makefile b/usr.sbin/rpc.bootparamd/Makefile
index 7530a427e428..fd190d919fce 100644
--- a/usr.sbin/rpc.bootparamd/Makefile
+++ b/usr.sbin/rpc.bootparamd/Makefile
@@ -1,11 +1,10 @@
-#	$Id: Makefile,v 1.6 1994/10/03 18:48:40 gwr Exp $
+#	$Id: Makefile,v 1.7 1994/12/22 11:40:50 cgd Exp $
 
 CFLAGS+=-DYP
 
 PROG=	rpc.bootparamd
 SRCS=	bootparamd.c bootparam_prot_svc.c
-MAN5=	bootparams.0
-MAN8=	rpc.bootparamd.0
+MAN=	bootparams.5 rpc.bootparamd.8
 MLINKS=	rpc.bootparamd.8 bootparamd.8
 
 DPADD=	${LIBRPCSVC}
diff --git a/usr.sbin/rwhod/Makefile b/usr.sbin/rwhod/Makefile
index f1e0353d1f49..5c695bf35991 100644
--- a/usr.sbin/rwhod/Makefile
+++ b/usr.sbin/rwhod/Makefile
@@ -1,8 +1,8 @@
 #	from: @(#)Makefile	5.3 (Berkeley) 5/11/90
-#	$Id: Makefile,v 1.5 1994/04/06 03:01:46 andrew Exp $
+#	$Id: Makefile,v 1.6 1994/12/22 11:41:06 cgd Exp $
 
 PROG=	rwhod
-MAN8=	rwhod.0
+MAN=	rwhod.8
 DPADD=	${LIBKVM}
 LDADD=	-lkvm
 
diff --git a/usr.sbin/sa/Makefile b/usr.sbin/sa/Makefile
index ee412a6e6c7d..2cc6994f21a2 100644
--- a/usr.sbin/sa/Makefile
+++ b/usr.sbin/sa/Makefile
@@ -1,7 +1,7 @@
-#	$Id: Makefile,v 1.1 1994/03/24 18:41:48 cgd Exp $
+#	$Id: Makefile,v 1.2 1994/12/22 11:41:22 cgd Exp $
 
 PROG=	sa
-MAN8=	sa.0
+MAN=	sa.8
 SRCS=	main.c pdb.c usrdb.c
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/sendmail/makemap/Makefile b/usr.sbin/sendmail/makemap/Makefile
index 462583a91362..a8592fec10a1 100644
--- a/usr.sbin/sendmail/makemap/Makefile
+++ b/usr.sbin/sendmail/makemap/Makefile
@@ -1,7 +1,7 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/7/93
 
 PROG=	makemap
-MAN8=	makemap.0
+MAN=	makemap.8
 CFLAGS+=-I${.CURDIR}/../src -DNDBM -DNEWDB
 
 .include "../../Makefile.inc"
diff --git a/usr.sbin/sendmail/src/Makefile b/usr.sbin/sendmail/src/Makefile
index 187957460100..aa843bbe4a8e 100644
--- a/usr.sbin/sendmail/src/Makefile
+++ b/usr.sbin/sendmail/src/Makefile
@@ -24,9 +24,7 @@ SRCS=	alias.c arpadate.c clock.c collect.c conf.c convtime.c daemon.c \
 	mci.c parseaddr.c queue.c readcf.c recipient.c savemail.c srvrsmtp.c \
 	stab.c stats.c sysexits.c trace.c udb.c usersmtp.c \
 	util.c version.c
-MAN1=	mailq.0 newaliases.0
-MAN5=	aliases.0
-MAN8=	sendmail.0 
+MAN=	aliases.5 mailq.1 newaliases.1 sendmail.8
 LINKS=	/usr/sbin/sendmail /usr/bin/newaliases \
 	/usr/sbin/sendmail /usr/bin/mailq
 BINDIR=	/usr/sbin
diff --git a/usr.sbin/sendmail/src/Makefile.NetBSD b/usr.sbin/sendmail/src/Makefile.NetBSD
index 187957460100..aa843bbe4a8e 100644
--- a/usr.sbin/sendmail/src/Makefile.NetBSD
+++ b/usr.sbin/sendmail/src/Makefile.NetBSD
@@ -24,9 +24,7 @@ SRCS=	alias.c arpadate.c clock.c collect.c conf.c convtime.c daemon.c \
 	mci.c parseaddr.c queue.c readcf.c recipient.c savemail.c srvrsmtp.c \
 	stab.c stats.c sysexits.c trace.c udb.c usersmtp.c \
 	util.c version.c
-MAN1=	mailq.0 newaliases.0
-MAN5=	aliases.0
-MAN8=	sendmail.0 
+MAN=	aliases.5 mailq.1 newaliases.1 sendmail.8
 LINKS=	/usr/sbin/sendmail /usr/bin/newaliases \
 	/usr/sbin/sendmail /usr/bin/mailq
 BINDIR=	/usr/sbin
diff --git a/usr.sbin/sliplogin/Makefile b/usr.sbin/sliplogin/Makefile
index 41b10c7dde8f..51101e08e8f8 100644
--- a/usr.sbin/sliplogin/Makefile
+++ b/usr.sbin/sliplogin/Makefile
@@ -1,8 +1,8 @@
 #	from: @(#)Makefile	5.1 (Berkeley) 5/11/90
-#	$Id: Makefile,v 1.2 1993/07/30 20:50:56 mycroft Exp $
+#	$Id: Makefile,v 1.3 1994/12/22 11:42:57 cgd Exp $
 
 PROG=	sliplogin
-MAN8=	sliplogin.0
+MAN=	sliplogin.8
 BINOWN=	root
 BINMODE=4555