diff --git a/share/Makefile b/share/Makefile
index 5763c3e757a7..adab2fd06304 100644
--- a/share/Makefile
+++ b/share/Makefile
@@ -1,7 +1,7 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
 
 # XXX BROKEN LINKS:	doc
-# XXX BROKEN TEMP:	man mk
-SUBDIR=	dict examples me misc skel tabset termcap tmac zoneinfo
+# XXX BROKEN TEMP:	mk
+SUBDIR=	dict examples man me misc skel tabset termcap tmac zoneinfo
 
 .include <bsd.subdir.mk>
diff --git a/share/man/Makefile b/share/man/Makefile
index 8af1d3f8e5ed..303f28ffa675 100644
--- a/share/man/Makefile
+++ b/share/man/Makefile
@@ -4,17 +4,17 @@
 SUBDIR=	man1 man3 man4 man5 man7 man8
 SEDF= /usr/share/man/makewhatis.sed
 
-afterinstall:
-	install -c -o ${BINOWN} -g ${BINGRP} -m 444 makewhatis.sed \
-	    ${DESTDIR}${SEDF}
-
-makedb:
-	find /usr/share/man -type f -name '*.0' -print | \
-	while read file; \
-	do \
-		sed -n -f ${SEDF} $$file; \
-	done | col -b | sort -u > /tmp/whatis.db
-	install -o ${BINOWN} -g ${BINGRP} -m 444 /tmp/whatis.db \
-	    ${DESTDIR}/usr/share/man
-
+#afterinstall:
+#	install -c -o ${BINOWN} -g ${BINGRP} -m 444 makewhatis.sed \
+#	    ${DESTDIR}${SEDF}
+#
+#makedb:
+#	find /usr/share/man -type f -name '*.0' -print | \
+#	while read file; \
+#	do \
+#		sed -n -f ${SEDF} $$file; \
+#	done | col -b | sort -u > /tmp/whatis.db
+#	install -o ${BINOWN} -g ${BINGRP} -m 444 /tmp/whatis.db \
+#	    ${DESTDIR}/usr/share/man
+#
 .include <bsd.subdir.mk>
diff --git a/share/man/man1/Makefile b/share/man/man1/Makefile
index 9e3d8d655a3e..558bf2ef4c70 100644
--- a/share/man/man1/Makefile
+++ b/share/man/man1/Makefile
@@ -1,6 +1,6 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
 
-MAN1=	cd.0 intro.0 wait.0
+MAN1=	cd.1 intro.1 wait.1
 
 .include <bsd.prog.mk>
 
diff --git a/share/man/man3/Makefile b/share/man/man3/Makefile
index 673ff360c7e7..0aa0bbc8260b 100644
--- a/share/man/man3/Makefile
+++ b/share/man/man3/Makefile
@@ -1,6 +1,6 @@
 #	@(#)Makefile	8.2 (Berkeley) 12/13/93
 
-MAN3=	assert.0 bitstring.0 end.0 intro.0 queue.0 stdarg.0
+MAN3=	assert.3 bitstring.3 end.3 intro.3 queue.3 stdarg.3
 MLINKS+=end.3 edata.3 end.3 etext.3 moncontrol.3 monstartup.3
 MLINKS+=queue.3 list_entry.3 queue.3 list_head.3 queue.3 list_init.3
 MLINKS+=queue.3 list_insert_after.3 queue.3 list_insert_head.3
@@ -14,13 +14,8 @@ MLINKS+=queue.3 circleq_insert_tail.3 queue.3 circleq_remove.3
 MLINKS+=stdarg.3 varargs.3 stdarg.3 va_arg.3 stdarg.3 va_end.3
 MLINKS+=stdarg.3 va_start.3
 
-all: ${MAN3}
-
 clean depend lint tags:
 
-cleandir:
-	rm -f ${MAN3}
-
 install: maninstall
 
 .include <bsd.prog.mk>
diff --git a/share/man/man5/Makefile b/share/man/man5/Makefile
index 78bf3048d942..239c710945e7 100644
--- a/share/man/man5/Makefile
+++ b/share/man/man5/Makefile
@@ -1,18 +1,14 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
 
-MAN5=	a.out.0 acct.0 core.0 dir.0 disktab.0 dump.0 fs.0 fstab.0 \
-	group.0 hosts.0 networks.0 passwd.0 phones.0 plot.0 printcap.0 \
-	protocols.0 remote.0 resolver.0 services.0 shells.0 stab.0 types.0 \
-	utmp.0
-MLINKS=	fs.5 inode.5 dump.5 dumpdates.5 utmp.5 wtmp.5
-
-all: ${MAN5}
+#MISSING: dump.5 plot.5
+MAN5=	a.out.5 acct.5 core.5 dir.5 disktab.5 fs.5 fstab.5 \
+	group.5 hosts.5 networks.5 passwd.5 phones.5 printcap.5 \
+	protocols.5 remote.5 resolver.5 services.5 shells.5 stab.5 types.5 \
+	utmp.5
+MLINKS=	fs.5 inode.5 utmp.5 wtmp.5
 
 clean depend lint tags:
 
-cleandir:
-	rm -f ${MAN5}
-
 install: maninstall
 
 .include <bsd.prog.mk>
diff --git a/share/man/man7/Makefile b/share/man/man7/Makefile
index dd3fe2b43862..f67d04f6fe60 100644
--- a/share/man/man7/Makefile
+++ b/share/man/man7/Makefile
@@ -1,16 +1,12 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
 
-MAN7=	ascii.0 environ.0 eqnchar.0 hier.0 hostname.0 intro.0 mailaddr.0 \
-	man.0 mdoc.0 mdoc.samples.0 ms.0 operator.0 term.0
+#MISSING: eqnchar.7 man.7 ms.7 term.7
+MAN7=	ascii.7 environ.7 hier.7 hostname.7 intro.7 mailaddr.7 \
+	mdoc.7 mdoc.samples.7 operator.7 
 MLINKS=	intro.7 miscellaneous.7
 
-all: ${MAN7}
-
 clean depend lint tags:
 
-cleandir:
-	rm -f ${MAN7}
-
 install: maninstall
 
 .include <bsd.prog.mk>
diff --git a/share/man/man8/Makefile b/share/man/man8/Makefile
index 8eea75105962..9be23e70b325 100644
--- a/share/man/man8/Makefile
+++ b/share/man/man8/Makefile
@@ -1,6 +1,6 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
 
-MAN8=	adduser.0 intro.0 rc.0 sticky.0
+MAN8=	adduser.8 intro.8 rc.8 sticky.8
 # XXX NOT IMPORTED:	man8.hp300 man8.tahoe man8.vax
 SUBDIR=	man8.i386
 
diff --git a/share/man/man8/man8.alpha/Makefile b/share/man/man8/man8.alpha/Makefile
index 06a815cfb5db..101d79156387 100644
--- a/share/man/man8/man8.alpha/Makefile
+++ b/share/man/man8/man8.alpha/Makefile
@@ -1,15 +1,10 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
 
-MAN8=	MAKEDEV.0
+MAN8=	MAKEDEV.8
 MANSUBDIR=/i386
 
-all: ${MAN8}
-
 clean depend lint tags:
 
-cleandir:
-	rm -f ${MAN8}
-
 install: maninstall
 
 .include <bsd.prog.mk>
diff --git a/share/man/man8/man8.i386/Makefile b/share/man/man8/man8.i386/Makefile
index 06a815cfb5db..101d79156387 100644
--- a/share/man/man8/man8.i386/Makefile
+++ b/share/man/man8/man8.i386/Makefile
@@ -1,15 +1,10 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
 
-MAN8=	MAKEDEV.0
+MAN8=	MAKEDEV.8
 MANSUBDIR=/i386
 
-all: ${MAN8}
-
 clean depend lint tags:
 
-cleandir:
-	rm -f ${MAN8}
-
 install: maninstall
 
 .include <bsd.prog.mk>