diff --git a/share/man/man0/Makefile b/share/man/man0/Makefile
index f2a12b24098..f612c8eb25b 100644
--- a/share/man/man0/Makefile
+++ b/share/man/man0/Makefile
@@ -2,12 +2,13 @@
 # Copyright (c) 1986, 1993 Regents of the University of California.
 # All rights reserved.
 #
-#	@(#)Makefile	8.2 (Berkeley) 1/29/94
+#	From: @(#)Makefile	8.2 (Berkeley) 1/29/94
+#	$Id$
 #
 SRCS=	man1 man2 man3 man4 man5 man6 man7 man8
 
 MACROS=	-ms
-PRINTER=Pps
+PRINTER=ps
 TBL=	tbl
 TROFF=	groff
 
@@ -65,5 +66,5 @@ man8pages: man8
 	for i in `cat man8`; do groff -man $$i >>man8pages; done;
 
 clean:
-	rm -f title.urm.[PT]* title.prm.[PT]* toc? tocx? ptxx \
+	rm -f title.urm.${PRINTER} title.prm.${PRINTER} toc? tocx? ptxx \
 		*.spell errs Errs make.out
diff --git a/share/man/man0/README b/share/man/man0/README
new file mode 100644
index 00000000000..c022bb84f55
--- /dev/null
+++ b/share/man/man0/README
@@ -0,0 +1,18 @@
+These files have been somewhat updated so that they at least format
+without fatal errors under FreeBSD 2.0-current (and so presumably 2.1).
+Some parts are not very accurate, and quite a bit of extra verbiage
+should probably be added describing FreeBSD additions relative to 4.4.
+The formatting is not perfect, and groff generates copious errors which
+hopefully some [nt]roff expert will actually look into some day.  The entire
+suite needs to be fixed to learn to live with obj directories, in line
+with our goal to have a completely read-only source tree, before it can
+be added to the top-level Makefile (if it is even then).
+
+The man[1-8] files were generated through the following process:
+	locate *.1
+	pipe through a long series of fgrep and sed commands to fix up
+	sort-regexp ^.*/\([^/]*\)$ \1 in Emacs
+	visually inspect the result for duplicates and false matches
+
+Garrett Wollman <wollman@lcs.mit.edu>
+11 January 1995
diff --git a/share/man/man0/man1 b/share/man/man0/man1
index f826fb1ae5d..4e787448b2d 100644
--- a/share/man/man0/man1
+++ b/share/man/man0/man1
@@ -1,67 +1,72 @@
-/usr/src/share/man/man1/intro.1
-/usr/src/old/adb/common_source/adb.1
-/usr/src/contrib/groff-1.08/addftinfo/addftinfo.1
-/usr/src/contrib/groff-1.08/afmtodit/afmtodit.1
-/usr/src/contrib/ansi/ansitape.1
+/usr/src/gnu/usr.bin/perl/perl/x2p/a2p.1
+/usr/src/gnu/usr.bin/perl/x2p/a2p.1
+/usr/src/gnu/usr.bin/groff/addftinfo/addftinfo.1
+/usr/src/gnu/usr.bin/groff/afmtodit/afmtodit.1
 /usr/src/usr.bin/apply/apply.1
-/usr/src/usr.bin/apropos/apropos.1
 /usr/src/usr.bin/ar/ar.1
-/usr/src/usr.bin/at/at/at.1
-/usr/src/usr.bin/at/atq/atq.1
-/usr/src/usr.bin/at/atrm/atrm.1
-/usr/src/contrib/gawk-2.15.2/awk.1
+/usr/src/gnu/usr.bin/as/as.1
+/usr/src/usr.bin/at/at.1
+/usr/src/gnu/usr.bin/awk/awk.1
 /usr/src/usr.bin/basename/basename.1
-/usr/src/usr.bin/bc/bc.1
-/usr/src/usr.bin/bdes/bdes.1
-/usr/src/contrib/bib/man/bib.1
+/usr/src/gnu/usr.bin/bc/bc.1
+/usr/src/secure/usr.bin/bdes/bdes.1
 /usr/src/usr.bin/biff/biff.1
+/usr/src/gnu/usr.bin/perl/misc/c2ph.1
+/usr/src/gnu/usr.bin/perl/perl/misc/c2ph.1
 /usr/src/usr.bin/cal/cal.1
 /usr/src/usr.bin/calendar/calendar.1
 /usr/src/usr.bin/cap_mkdb/cap_mkdb.1
 /usr/src/bin/cat/cat.1
-/usr/src/contrib/gcc-2.3.3/cc.1
+/usr/src/gnu/usr.bin/cc/cc/cc.1
 /usr/src/share/man/man1/cd.1
 /usr/src/usr.bin/checknr/checknr.1
 /usr/src/usr.bin/chflags/chflags.1
 /usr/src/usr.sbin/chown/chgrp.1
-/usr/src/lib/librpc/secure_rpc/man/chkey.1
+/usr/src/secure/lib/secure_rpc/man/chkey.1
 /usr/src/bin/chmod/chmod.1
 /usr/src/usr.bin/chpass/chpass.1
-/usr/src/contrib/rcs-V5.6/man/ci.1
+/usr/src/gnu/usr.bin/rcs/ci/ci.1
 /usr/src/usr.bin/cksum/cksum.1
 /usr/src/usr.bin/cmp/cmp.1
-/usr/src/contrib/rcs-V5.6/man/co.1
+/usr/src/gnu/usr.bin/rcs/co/co.1
 /usr/src/usr.bin/col/col.1
 /usr/src/usr.bin/colcrt/colcrt.1
 /usr/src/usr.bin/colrm/colrm.1
 /usr/src/usr.bin/column/column.1
 /usr/src/usr.bin/comm/comm.1
-/usr/src/old/compact/compact/compact.1
 /usr/src/usr.bin/compress/compress.1
 /usr/src/bin/cp/cp.1
-/usr/src/contrib/gcc-2.3.3/cpp.1
-/usr/src/old/crypt/crypt.1
+/usr/src/gnu/usr.bin/cpio/cpio.1
+/usr/src/gnu/usr.bin/cc/cpp/cpp.1
+/usr/src/usr.sbin/cron/crontab/crontab.1
+/usr/src/usr.sbin/crunch/crunchgen/crunchgen.1
+/usr/src/usr.sbin/crunch/crunchide/crunchide.1
 /usr/src/bin/csh/csh.1
+/usr/src/bin/csh/USD.doc/csh.1
 /usr/src/usr.bin/ctags/ctags.1
+/usr/src/gnu/libexec/uucp/cu/cu.1
 /usr/src/usr.bin/cut/cut.1
+/usr/src/gnu/usr.bin/cvs/cvs/cvs.1
 /usr/src/bin/date/date.1
-/usr/src/usr.bin/dc/dc.1
+/usr/src/gnu/usr.bin/dc/dc.1
 /usr/src/bin/dd/dd.1
-/usr/src/usr.bin/deroff/deroff.1
 /usr/src/bin/df/df.1
-/usr/src/usr.bin/diction/diction/diction.1
-/usr/src/usr.bin/diff/diff/diff.1
-/usr/src/usr.bin/diff/diff3/diff3.1
-/usr/src/contrib/bind-4.9.2/man/dig.1
+/usr/src/gnu/usr.bin/dialog/dialog.1
+/usr/src/gnu/usr.bin/diff/diff.1
+/usr/src/gnu/usr.bin/diff3/diff3.1
+/usr/src/usr.bin/dig/dig.1
+/usr/src/bin/domainname/domainname.1
 /usr/src/usr.bin/du/du.1
-/usr/src/bin/sh/bltin/echo.1
-/usr/src/contrib/ed/ed.1
-/usr/src/contrib/emacs-18.57/etc/emacs.1
-/usr/src/contrib/groff-1.08/eqn/eqn.1
+/usr/src/bin/echo/echo.1
+/usr/src/bin/ed/ed.1
+/usr/src/gnu/usr.bin/groff/eqn/eqn.1
 /usr/src/usr.bin/error/error.1
 /usr/src/usr.bin/expand/expand.1
 /usr/src/bin/expr/expr.1
+/usr/src/usr.bin/f2c/f2c.1
 /usr/src/usr.bin/false/false.1
+/usr/src/usr.sbin/fdformat/fdformat.1
+/usr/src/usr.sbin/fdwrite/fdwrite.1
 /usr/src/usr.bin/file/file.1
 /usr/src/usr.bin/find/find.1
 /usr/src/usr.bin/finger/finger.1
@@ -72,49 +77,67 @@
 /usr/src/usr.bin/fsplit/fsplit.1
 /usr/src/usr.bin/fstat/fstat.1
 /usr/src/usr.bin/ftp/ftp.1
-/usr/src/contrib/gcc-2.3.3/g++.1
 /usr/src/usr.bin/gcore/gcore.1
-/usr/src/contrib/gdb-4.7.LBL/gdb/gdb.1
+/usr/src/gnu/usr.bin/gdb/gdb/gdb.1
+/usr/src/usr.bin/getopt/getopt.1
 /usr/src/usr.bin/gprof/gprof.1
-/usr/src/usr.bin/graph/graph.1
-/usr/src/usr.bin/grep/egrep/grep.1
-/usr/src/contrib/groff-1.08/grodvi/grodvi.1
-/usr/src/contrib/groff-1.08/groff/groff.1
-/usr/src/contrib/groff-1.08/grog/grog.1
-/usr/src/contrib/groff-1.08/grops/grops.1
-/usr/src/contrib/groff-1.08/grotty/grotty.1
+/usr/src/gnu/usr.bin/grep/grep.1
+/usr/src/gnu/usr.bin/groff/grodvi/grodvi.1
+/usr/src/gnu/usr.bin/groff/groff/groff.1
+/usr/src/gnu/usr.bin/groff/grog/grog.1
+/usr/src/gnu/usr.bin/groff/grops/grops.1
+/usr/src/gnu/usr.bin/groff/grotty/grotty.1
 /usr/src/usr.bin/id/groups.1
-/usr/src/contrib/gzip-1.2.4/gzexe.1
-/usr/src/contrib/gzip-1.2.4/gzip.1
+/usr/src/gnu/usr.bin/groff/xditview/gxditview.1
+/usr/src/gnu/usr.bin/gzip/gzexe.1
+/usr/src/gnu/usr.bin/gzip/gzip.1
+/usr/src/gnu/usr.bin/perl/perl/x2p/h2ph.1
+/usr/src/gnu/usr.bin/perl/x2p/h2ph.1
 /usr/src/usr.bin/head/head.1
 /usr/src/usr.bin/hexdump/hexdump.1
-/usr/src/contrib/bind-4.9.2/man/host.1
+/usr/src/usr.bin/host/host.1
 /usr/src/bin/hostname/hostname.1
 /usr/src/usr.bin/id/id.1
-/usr/src/contrib/rcs-V5.6/man/ident.1
+/usr/src/gnu/usr.bin/rcs/ident/ident.1
 /usr/src/usr.bin/indent/indent.1
-/usr/src/contrib/groff-1.08/indxbib/indxbib.1
+/usr/src/gnu/usr.bin/groff/indxbib/indxbib.1
+/usr/src/gnu/usr.bin/texinfo/info/info.1
 /usr/src/usr.bin/xinstall/install.1
-/usr/src/contrib/bib/man/invert.1
+/usr/src/share/man/man1/intro.1
+/usr/src/usr.bin/ipcrm/ipcrm.1
+/usr/src/usr.bin/ipcs/ipcs.1
 /usr/src/usr.bin/join/join.1
 /usr/src/usr.bin/jot/jot.1
+/usr/src/usr.sbin/kbdcontrol/kbdcontrol.1
+/usr/src/eBones/man/kdestroy.1
 /usr/src/kerberosIV/man/kdestroy.1
 /usr/src/usr.bin/kdump/kdump.1
+/usr/src/eBones/man/kerberos.1
 /usr/src/kerberosIV/man/kerberos.1
-/usr/src/lib/librpc/secure_rpc/man/keylogin.1
+/usr/src/usr.bin/key/key.1
+/usr/src/usr.bin/keyinfo/keyinfo.1
+/usr/src/usr.bin/keyinit/keyinit.1
+/usr/src/secure/lib/secure_rpc/man/keylogin.1
+/usr/src/gnu/usr.bin/kgdb/kgdb.1
 /usr/src/bin/kill/kill.1
+/usr/src/eBones/man/kinit.1
 /usr/src/kerberosIV/man/kinit.1
+/usr/src/eBones/man/klist.1
 /usr/src/kerberosIV/man/klist.1
+/usr/src/eBones/man/kpasswd.1
+/usr/src/eBones/man/ksrvtgt.1
 /usr/src/kerberosIV/man/ksrvtgt.1
+/usr/src/eBones/man/ksu.1
 /usr/src/usr.bin/ktrace/ktrace.1
 /usr/src/usr.bin/lam/lam.1
 /usr/src/usr.bin/last/last.1
 /usr/src/usr.bin/lastcomm/lastcomm.1
-/usr/src/old/ld/ld.1
-/usr/src/usr.bin/learn/learn/learn.1
+/usr/src/gnu/usr.bin/ld/ld.1
+/usr/src/gnu/usr.bin/ld/ldd/ldd.1
 /usr/src/usr.bin/leave/leave.1
-/usr/src/contrib/flex-2.4.6/lex.1
-/usr/src/contrib/groff-1.08/lkbib/lkbib.1
+/usr/src/usr.bin/lex/lex.1
+/usr/src/usr.bin/lex/lexdoc.1
+/usr/src/gnu/usr.bin/groff/lkbib/lkbib.1
 /usr/src/bin/ln/ln.1
 /usr/src/usr.bin/locate/locate/locate.1
 /usr/src/usr.bin/lock/lock.1
@@ -122,110 +145,125 @@
 /usr/src/usr.bin/login/login.1
 /usr/src/usr.bin/logname/logname.1
 /usr/src/usr.bin/look/look.1
-/usr/src/contrib/groff-1.08/lookbib/lookbib.1
+/usr/src/gnu/usr.bin/groff/lookbib/lookbib.1
 /usr/src/usr.bin/lorder/lorder.1
 /usr/src/usr.sbin/lpr/lpq/lpq.1
 /usr/src/usr.sbin/lpr/lpr/lpr.1
 /usr/src/usr.sbin/lpr/lprm/lprm.1
 /usr/src/usr.sbin/lpr/lptest/lptest.1
 /usr/src/bin/ls/ls.1
+/usr/src/usr.bin/lsvfs/lsvfs.1
 /usr/src/usr.bin/m4/m4.1
 /usr/src/usr.bin/mail/mail.1
 /usr/src/usr.sbin/sendmail/src/mailq.1
 /usr/src/usr.bin/make/make.1
-/usr/src/usr.bin/man/man.1
-/usr/src/contrib/rcs-V5.6/man/merge.1
+/usr/src/sbin/md5/md5.1
+/usr/src/gnu/usr.bin/rcs/merge/merge.1
 /usr/src/usr.bin/mesg/mesg.1
-/usr/src/contrib/mh-6.8.3a/doc/mh.1
 /usr/src/usr.bin/mkdep/mkdep.1
 /usr/src/bin/mkdir/mkdir.1
 /usr/src/usr.bin/mkfifo/mkfifo.1
 /usr/src/usr.bin/mklocale/mklocale.1
+/usr/src/gnu/usr.bin/cvs/mkmodules/mkmodules.1
 /usr/src/usr.bin/mkstr/mkstr.1
 /usr/src/usr.bin/more/more.1
 /usr/src/usr.bin/tn3270/mset/mset.1
 /usr/src/usr.bin/msgs/msgs.1
 /usr/src/usr.bin/mt/mt.1
 /usr/src/bin/mv/mv.1
+/usr/src/usr.bin/ncftp/ncftp.1
 /usr/src/usr.bin/netstat/netstat.1
 /usr/src/usr.sbin/sendmail/src/newaliases.1
 /usr/src/usr.bin/nfsstat/nfsstat.1
 /usr/src/usr.bin/nice/nice.1
 /usr/src/usr.bin/nm/nm.1
 /usr/src/usr.bin/nohup/nohup.1
-/usr/src/contrib/groff-1.08/nroff/nroff.1
+/usr/src/gnu/usr.bin/groff/nroff/nroff.1
 /usr/src/usr.bin/hexdump/od.1
 /usr/src/usr.bin/pagesize/pagesize.1
 /usr/src/usr.bin/passwd/passwd.1
 /usr/src/usr.bin/paste/paste.1
-/usr/src/usr.bin/patch/patch.1
+/usr/src/gnu/usr.bin/patch/patch.1
 /usr/src/bin/pax/pax.1
-/usr/src/contrib/perl-4.036/perl.1
-/usr/src/contrib/groff-1.08/pfbtops/pfbtops.1
-/usr/src/contrib/groff-1.08/pic/pic.1
-/usr/src/usr.bin/plot/plot.1
+/usr/src/gnu/usr.bin/perl/perl/perl.1
+/usr/src/gnu/usr.bin/groff/pfbtops/pfbtops.1
+/usr/src/gnu/usr.bin/groff/pic/pic.1
+/usr/src/usr.sbin/pkg_install/add/pkg_add.1
+/usr/src/usr.sbin/pkg_install/create/pkg_create.1
+/usr/src/usr.sbin/pkg_install/delete/pkg_delete.1
+/usr/src/usr.sbin/pkg_install/info/pkg_info.1
 /usr/src/usr.bin/pr/pr.1
 /usr/src/usr.bin/printenv/printenv.1
 /usr/src/usr.bin/printf/printf.1
 /usr/src/bin/ps/ps.1
-/usr/src/contrib/groff-1.08/psbb/psbb.1
-/usr/src/usr.bin/ptx/ptx.1
+/usr/src/gnu/usr.bin/groff/psbb/psbb.1
 /usr/src/bin/pwd/pwd.1
 /usr/src/usr.bin/quota/quota.1
 /usr/src/usr.bin/ranlib/ranlib.1
 /usr/src/bin/rcp/rcp.1
-/usr/src/contrib/rcs-V5.6/man/rcs.1
-/usr/src/contrib/rcs-V5.6/man/rcsclean.1
-/usr/src/contrib/rcs-V5.6/man/rcsdiff.1
-/usr/src/contrib/rcs-V5.6/man/rcsfreeze.1
-/usr/src/contrib/rcs-V5.6/man/rcsintro.1
-/usr/src/contrib/rcs-V5.6/man/rcsmerge.1
+/usr/src/eBones/man/rcp.1
+/usr/src/gnu/usr.bin/rcs/rcs/rcs.1
+/usr/src/gnu/usr.bin/rcs/rcsclean/rcsclean.1
+/usr/src/gnu/usr.bin/rcs/rcsdiff/rcsdiff.1
+/usr/src/gnu/usr.bin/rcs/rcsfreeze/rcsfreeze.1
+/usr/src/gnu/usr.bin/rcs/rcs/rcsintro.1
+/usr/src/gnu/usr.bin/rcs/rcsmerge/rcsmerge.1
 /usr/src/usr.bin/rdist/rdist.1
-/usr/src/contrib/groff-1.08/refer/refer.1
+/usr/src/gnu/usr.bin/groff/refer/refer.1
+/usr/src/eBones/register/register.1
 /usr/src/kerberosIV/register/register.1
 /usr/src/usr.bin/rev/rev.1
-/usr/src/contrib/rcs-V5.6/man/rlog.1
+/usr/src/gnu/usr.bin/rcs/rlog/rlog.1
+/usr/src/eBones/man/rlogin.1
 /usr/src/usr.bin/rlogin/rlogin.1
 /usr/src/bin/rm/rm.1
 /usr/src/bin/rmdir/rmdir.1
-/usr/src/lib/librpc/man/man1/rpcgen.1
+/usr/src/usr.bin/rpcgen/rpcgen.1
 /usr/src/usr.bin/rs/rs.1
+/usr/src/eBones/man/rsh.1
 /usr/src/usr.bin/rsh/rsh.1
-/usr/src/lib/librpc/man/man1/rstat.1
+/usr/src/lib/libc/rpc/rstat.1
+/usr/src/usr.sbin/rtprio/rtprio.1
+/usr/src/usr.bin/rup/rup.1
 /usr/src/usr.bin/ruptime/ruptime.1
+/usr/src/usr.bin/rusers/rusers.1
+/usr/src/usr.bin/rwall/rwall.1
 /usr/src/usr.bin/rwho/rwho.1
-/usr/src/usr.bin/sccs/sccs.1
+/usr/src/gnu/usr.bin/perl/perl/x2p/s2p.1
+/usr/src/gnu/usr.bin/perl/x2p/s2p.1
 /usr/src/usr.bin/script/script.1
+/usr/src/gnu/usr.bin/sdiff/sdiff.1
 /usr/src/usr.bin/sed/sed.1
-/usr/src/libexec/bugfiler/sendbug.1
+/usr/src/gnu/usr.bin/send-pr/send-pr.1
 /usr/src/bin/sh/sh.1
 /usr/src/usr.bin/shar/shar.1
 /usr/src/usr.bin/size/size.1
+/usr/src/lib/libskey/skey.1
 /usr/src/bin/sleep/sleep.1
+/usr/src/gnu/usr.bin/groff/soelim/soelim.1
 /usr/src/usr.bin/soelim/soelim.1
-/usr/src/usr.bin/sort/sort.1
-/usr/src/usr.bin/spell/spell.1
-/usr/src/usr.bin/spline/spline.1
+/usr/src/gnu/usr.bin/sort/sort.1
 /usr/src/usr.bin/split/split.1
 /usr/src/sbin/startslip/startslip.1
 /usr/src/usr.bin/strings/strings.1
 /usr/src/usr.bin/strip/strip.1
-/usr/src/usr.bin/struct/struct/struct.1
 /usr/src/bin/stty/stty.1
-/usr/src/usr.bin/diction/style/style.1
 /usr/src/usr.bin/su/su.1
-/usr/src/old/sum/sum.1
-/usr/src/old/symorder/symorder.1
+/usr/src/usr.sbin/swapinfo/swapinfo.1
+/usr/src/usr.bin/symorder/symorder.1
 /usr/src/usr.bin/systat/systat.1
 /usr/src/usr.bin/tail/tail.1
 /usr/src/usr.bin/talk/talk.1
-/usr/src/old/tar/tar.1
-/usr/src/contrib/groff-1.08/tbl/tbl.1
+/usr/src/gnu/usr.bin/groff/tbl/tbl.1
+/usr/src/usr.bin/tconv/tconv.1
 /usr/src/usr.bin/tcopy/tcopy.1
+/usr/src/usr.sbin/tcpdump/tcpdump/tcpdump.1
+/usr/src/usr.sbin/tcpdump/tcpslice/tcpslice.1
 /usr/src/usr.bin/tee/tee.1
+/usr/src/secure/usr.bin/telnet/telnet.1
 /usr/src/usr.bin/telnet/telnet.1
 /usr/src/bin/test/test.1
-/usr/src/contrib/groff-1.08/tfmtodit/tfmtodit.1
+/usr/src/gnu/usr.bin/groff/tfmtodit/tfmtodit.1
 /usr/src/usr.bin/tftp/tftp.1
 /usr/src/usr.bin/time/time.1
 /usr/src/usr.bin/tip/tip.1
@@ -233,7 +271,7 @@
 /usr/src/usr.bin/touch/touch.1
 /usr/src/usr.bin/tput/tput.1
 /usr/src/usr.bin/tr/tr.1
-/usr/src/contrib/groff-1.08/troff/troff.1
+/usr/src/gnu/usr.bin/groff/troff/troff.1
 /usr/src/usr.bin/true/true.1
 /usr/src/usr.bin/tset/tset.1
 /usr/src/usr.bin/tsort/tsort.1
@@ -242,43 +280,42 @@
 /usr/src/usr.bin/uname/uname.1
 /usr/src/usr.bin/unifdef/unifdef.1
 /usr/src/usr.bin/uniq/uniq.1
-/usr/src/usr.bin/units/units.1
 /usr/src/usr.bin/unvis/unvis.1
 /usr/src/usr.bin/w/uptime.1
 /usr/src/usr.bin/users/users.1
-/usr/src/usr.bin/uucp/uucp/uucp.1
+/usr/src/gnu/libexec/uucp/uucp/uucp.1
 /usr/src/usr.bin/uuencode/uuencode.1
-/usr/src/usr.bin/uucp/uulog/uulog.1
-/usr/src/usr.bin/uucp/uuname/uuname.1
 /usr/src/usr.bin/uucp/uuq/uuq.1
-/usr/src/usr.bin/uucp/uusend/uusend.1
-/usr/src/usr.bin/uucp/uux/uux.1
+/usr/src/gnu/libexec/uucp/uustat/uustat.1
+/usr/src/gnu/libexec/uucp/uux/uux.1
 /usr/src/usr.bin/vacation/vacation.1
 /usr/src/usr.bin/vgrind/vgrind.1
-/usr/src/contrib/nvi.1.14/obj/vi.1
+/usr/src/usr.bin/vi/USD.doc/vi.man/vi.1
+/usr/src/usr.sbin/vidcontrol/vidcontrol.1
 /usr/src/usr.bin/vis/vis.1
 /usr/src/usr.bin/w/w.1
 /usr/src/share/man/man1/wait.1
 /usr/src/usr.bin/wall/wall.1
 /usr/src/usr.bin/wc/wc.1
 /usr/src/usr.bin/what/what.1
-/usr/src/usr.bin/whatis/whatis.1
 /usr/src/usr.bin/whereis/whereis.1
-/usr/src/old/which/which.1
 /usr/src/usr.bin/who/who.1
 /usr/src/usr.bin/id/whoami.1
 /usr/src/usr.bin/whois/whois.1
 /usr/src/usr.bin/window/window.1
 /usr/src/usr.bin/write/write.1
 /usr/src/usr.bin/xargs/xargs.1
-/usr/src/games/chess/Xchess/xchess.1
-/usr/src/usr.bin/xsend/xsend/xsend.1
+/usr/src/gnu/games/chess/Xchess/xchess.1
 /usr/src/usr.bin/xstr/xstr.1
+/usr/src/usr.sbin/xten/xten.1
+
 /usr/src/usr.bin/yacc/yacc.1
 /usr/src/usr.bin/yes/yes.1
+/usr/src/usr.bin/ypcat/ypcat.1
+/usr/src/usr.bin/ypmatch/ypmatch.1
 /usr/src/usr.bin/yacc/yyfix.1
-/usr/src/contrib/gzip-1.2.4/zdiff.1
-/usr/src/contrib/gzip-1.2.4/zforce.1
-/usr/src/contrib/gzip-1.2.4/zgrep.1
-/usr/src/contrib/gzip-1.2.4/zmore.1
-/usr/src/contrib/gzip-1.2.4/znew.1
+/usr/src/gnu/usr.bin/gzip/zdiff.1
+/usr/src/gnu/usr.bin/gzip/zforce.1
+/usr/src/gnu/usr.bin/gzip/zgrep.1
+/usr/src/gnu/usr.bin/gzip/zmore.1
+/usr/src/gnu/usr.bin/gzip/znew.1
\ No newline at end of file
diff --git a/share/man/man0/man2 b/share/man/man0/man2
index 2e4d1309297..857f8de2ec4 100644
--- a/share/man/man0/man2
+++ b/share/man/man0/man2
@@ -1,4 +1,4 @@
-/usr/src/lib/libc/sys/intro.2
+/usr/src/lib/libc/sys/_exit.2
 /usr/src/lib/libc/sys/accept.2
 /usr/src/lib/libc/sys/access.2
 /usr/src/lib/libc/sys/acct.2
@@ -15,7 +15,6 @@
 /usr/src/lib/libc/compat-43/creat.2
 /usr/src/lib/libc/sys/dup.2
 /usr/src/lib/libc/sys/execve.2
-/usr/src/lib/libc/sys/_exit.2
 /usr/src/lib/libc/sys/fcntl.2
 /usr/src/lib/libc/sys/flock.2
 /usr/src/lib/libc/sys/fork.2
@@ -38,6 +37,8 @@
 /usr/src/lib/libc/sys/getsockopt.2
 /usr/src/lib/libc/sys/gettimeofday.2
 /usr/src/lib/libc/sys/getuid.2
+/usr/src/lib/libc/i386/sys/i386_get_ldt.2
+/usr/src/lib/libc/sys/intro.2
 /usr/src/lib/libc/sys/ioctl.2
 /usr/src/lib/libc/sys/kill.2
 /usr/src/lib/libc/compat-43/killpg.2
@@ -61,7 +62,6 @@
 /usr/src/lib/libc/sys/pathconf.2
 /usr/src/lib/libc/sys/pipe.2
 /usr/src/lib/libc/sys/profil.2
-/usr/src/lib/libc/sys/ptrace.2
 /usr/src/lib/libc/sys/quotactl.2
 /usr/src/lib/libc/sys/read.2
 /usr/src/lib/libc/sys/readlink.2
@@ -70,6 +70,8 @@
 /usr/src/lib/libc/sys/rename.2
 /usr/src/lib/libc/sys/revoke.2
 /usr/src/lib/libc/sys/rmdir.2
+/usr/src/lib/libc/sys/rtprio.2
+/usr/src/usr.sbin/rtprio/rtprio.2
 /usr/src/lib/libc/sys/select.2
 /usr/src/lib/libc/sys/send.2
 /usr/src/lib/libc/sys/setgroups.2
@@ -104,4 +106,4 @@
 /usr/src/lib/libc/sys/utimes.2
 /usr/src/lib/libc/sys/vfork.2
 /usr/src/lib/libc/sys/wait.2
-/usr/src/lib/libc/sys/write.2
+/usr/src/lib/libc/sys/write.2
\ No newline at end of file
diff --git a/share/man/man0/man3 b/share/man/man0/man3
index 8175586780f..60d5dce410d 100644
--- a/share/man/man0/man3
+++ b/share/man/man0/man3
@@ -1,23 +1,23 @@
-/usr/src/share/man/man3/intro.3
 /usr/src/lib/libc/stdlib/abort.3
 /usr/src/lib/libc/stdlib/abs.3
-/usr/src/kerberosIV/man/acl_check.3
-/usr/src/lib/libm/common_source/acos.3
-/usr/src/lib/libm/common_source/acosh.3
+/usr/src/eBones/man/acl_check.3
+/usr/src/lib/msun/man/acos.3
+/usr/src/lib/msun/man/acosh.3
 /usr/src/lib/libc/gen/alarm.3
 /usr/src/lib/libc/stdlib/alloca.3
-/usr/src/lib/libm/common_source/asin.3
-/usr/src/lib/libm/common_source/asinh.3
+/usr/src/lib/msun/man/asin.3
+/usr/src/lib/msun/man/asinh.3
 /usr/src/share/man/man3/assert.3
-/usr/src/lib/libm/common_source/atan.3
-/usr/src/lib/libm/common_source/atan2.3
-/usr/src/lib/libm/common_source/atanh.3
+/usr/src/lib/msun/man/atan.3
+/usr/src/lib/msun/man/atan2.3
+/usr/src/lib/msun/man/atanh.3
 /usr/src/lib/libc/stdlib/atexit.3
 /usr/src/lib/libc/stdlib/atof.3
 /usr/src/lib/libc/stdlib/atoi.3
 /usr/src/lib/libc/stdlib/atol.3
 /usr/src/lib/libc/string/bcmp.3
 /usr/src/lib/libc/string/bcopy.3
+/usr/src/lib/libc/rpc/bindresvport.3
 /usr/src/share/man/man3/bitstring.3
 /usr/src/lib/libc/stdlib/bsearch.3
 /usr/src/lib/libc/string/bstring.3
@@ -25,38 +25,41 @@
 /usr/src/lib/libc/net/byteorder.3
 /usr/src/lib/libc/string/bzero.3
 /usr/src/lib/libc/stdlib/calloc.3
-/usr/src/lib/libm/common_source/ceil.3
+/usr/src/lib/msun/man/ceil.3
 /usr/src/lib/libc/gen/clock.3
+/usr/src/lib/libc/gen/config_open.3
 /usr/src/lib/libc/gen/confstr.3
-/usr/src/lib/libm/common_source/cos.3
-/usr/src/lib/libm/common_source/cosh.3
+/usr/src/lib/msun/man/cos.3
+/usr/src/lib/msun/man/cosh.3
 /usr/src/lib/libc/gen/crypt.3
+/usr/src/secure/lib/libcipher/crypt.3
+/usr/src/secure/lib/libcrypt/crypt.3
 /usr/src/lib/libc/gen/ctermid.3
-/usr/src/lib/libc/gen/ctime.3
+/usr/src/lib/libc/stdtime/ctime.3
 /usr/src/lib/libc/locale/ctype.3
 /usr/src/lib/libcurses/curses.3
 /usr/src/lib/libc/gen/daemon.3
 /usr/src/lib/libc/db/man/dbopen.3
-/usr/src/kerberosIV/man/des_crypt.3
-/usr/src/lib/libc/gen/devname.3
+/usr/src/eBones/des/des.3
+/usr/src/eBones/man/des_crypt.3
+/usr/src/secure/lib/secure_rpc/man/des_crypt.3
 /usr/src/lib/libc/gen/directory.3
 /usr/src/lib/libc/stdlib/div.3
-/usr/src/lib/libcompat/4.3/ecvt.3
 /usr/src/share/man/man3/end.3
-/usr/src/lib/libm/common_source/erf.3
+/usr/src/lib/msun/man/erf.3
 /usr/src/lib/libc/gen/err.3
 /usr/src/lib/libc/gen/exec.3
 /usr/src/lib/libc/stdlib/exit.3
-/usr/src/lib/libm/common_source/exp.3
-/usr/src/lib/libm/common_source/fabs.3
+/usr/src/lib/msun/man/exp.3
+/usr/src/lib/msun/man/fabs.3
 /usr/src/lib/libc/stdio/fclose.3
 /usr/src/lib/libc/stdio/ferror.3
 /usr/src/lib/libc/stdio/fflush.3
 /usr/src/lib/libc/string/ffs.3
 /usr/src/lib/libc/stdio/fgetln.3
 /usr/src/lib/libc/stdio/fgets.3
-/usr/src/lib/libm/common_source/floor.3
-/usr/src/lib/libm/common_source/fmod.3
+/usr/src/lib/msun/man/floor.3
+/usr/src/lib/msun/man/fmod.3
 /usr/src/lib/libc/gen/fnmatch.3
 /usr/src/lib/libc/stdio/fopen.3
 /usr/src/lib/libc/stdio/fputs.3
@@ -67,11 +70,13 @@
 /usr/src/lib/libcompat/4.1/ftime.3
 /usr/src/lib/libc/gen/fts.3
 /usr/src/lib/libc/stdio/funopen.3
+/usr/src/lib/libc/gen/getbootfile.3
 /usr/src/lib/libc/gen/getbsize.3
 /usr/src/lib/libc/stdio/getc.3
 /usr/src/lib/libc/gen/getcap.3
 /usr/src/lib/libc/gen/getcwd.3
 /usr/src/lib/libc/gen/getdiskbyname.3
+/usr/src/lib/libc/gen/getdomainname.3
 /usr/src/lib/libc/stdlib/getenv.3
 /usr/src/lib/libc/gen/getfsent.3
 /usr/src/lib/libc/gen/getgrent.3
@@ -90,19 +95,23 @@
 /usr/src/lib/libc/net/getprotoent.3
 /usr/src/lib/libcompat/4.1/getpw.3
 /usr/src/lib/libc/gen/getpwent.3
+/usr/src/lib/libc/rpc/getrpcent.3
+/usr/src/lib/libc/rpc/getrpcport.3
 /usr/src/lib/libc/net/getservent.3
 /usr/src/lib/libc/stdlib/getsubopt.3
 /usr/src/lib/libc/gen/getttyent.3
 /usr/src/lib/libc/gen/getusershell.3
+/usr/src/lib/libc/gen/getvfsent.3
 /usr/src/lib/libc/gen/glob.3
 /usr/src/lib/libc/db/man/hash.3
-/usr/src/lib/libm/common_source/hypot.3
-/usr/src/lib/libm/common_source/ieee.3
+/usr/src/lib/msun/man/hypot.3
+/usr/src/lib/msun/man/ieee.3
+/usr/src/lib/msun/man/ieee_test.3
 /usr/src/lib/libc/string/index.3
 /usr/src/lib/libc/net/inet.3
-/usr/src/lib/libm/common_source/infnan.3
 /usr/src/lib/libc/gen/initgroups.3
 /usr/src/lib/libcompat/4.3/insque.3
+/usr/src/share/man/man3/intro.3
 /usr/src/lib/libc/locale/isalnum.3
 /usr/src/lib/libc/locale/isalpha.3
 /usr/src/lib/libc/locale/isascii.3
@@ -118,12 +127,13 @@
 /usr/src/lib/libc/locale/isspace.3
 /usr/src/lib/libc/locale/isupper.3
 /usr/src/lib/libc/locale/isxdigit.3
-/usr/src/lib/libm/common_source/j0.3
-/usr/src/kerberosIV/man/krb.3
-/usr/src/kerberosIV/man/krb_realmofhost.3
-/usr/src/kerberosIV/man/krb_sendauth.3
-/usr/src/kerberosIV/man/krb_set_tkt_string.3
-/usr/src/kerberosIV/man/kuserok.3
+/usr/src/lib/msun/man/j0.3
+/usr/src/eBones/man/kerberos.3
+/usr/src/eBones/man/krb.3
+/usr/src/eBones/man/krb_realmofhost.3
+/usr/src/eBones/man/krb_sendauth.3
+/usr/src/eBones/man/krb_set_tkt_string.3
+/usr/src/eBones/man/kuserok.3
 /usr/src/lib/libkvm/kvm.3
 /usr/src/lib/libkvm/kvm_geterr.3
 /usr/src/lib/libkvm/kvm_getfiles.3
@@ -135,12 +145,13 @@
 /usr/src/lib/libc/stdlib/labs.3
 /usr/src/lib/libc/gen/ldexp.3
 /usr/src/lib/libc/stdlib/ldiv.3
-/usr/src/lib/libm/common_source/lgamma.3
+/usr/src/lib/msun/man/lgamma.3
 /usr/src/lib/libc/net/linkaddr.3
 /usr/src/lib/libcompat/4.3/lsearch.3
 /usr/src/lib/libc/stdlib/malloc.3
-/usr/src/lib/libm/common_source/math.3
+/usr/src/lib/msun/man/math.3
 /usr/src/lib/libc/locale/mbrune.3
+/usr/src/lib/libmd/mdX.3
 /usr/src/lib/libc/string/memccpy.3
 /usr/src/lib/libc/string/memchr.3
 /usr/src/lib/libc/string/memcmp.3
@@ -151,14 +162,12 @@
 /usr/src/lib/libc/stdio/mktemp.3
 /usr/src/lib/libc/gen/modf.3
 /usr/src/lib/libc/gmon/moncontrol.3
-/usr/src/lib/libmp/mp.3
 /usr/src/lib/libc/db/man/mpool.3
 /usr/src/lib/libc/locale/multibyte.3
 /usr/src/lib/libc/gen/nice.3
 /usr/src/lib/libc/gen/nlist.3
 /usr/src/lib/libc/net/ns.3
 /usr/src/lib/libc/gen/pause.3
-/usr/src/lib/libplot/plot/plot.3
 /usr/src/lib/libc/gen/popen.3
 /usr/src/lib/libc/stdio/printf.3
 /usr/src/lib/libc/gen/psignal.3
@@ -169,9 +178,11 @@
 /usr/src/lib/libc/stdlib/radixsort.3
 /usr/src/lib/libc/gen/raise.3
 /usr/src/lib/libc/stdlib/rand.3
+/usr/src/lib/libc/gen/rand48.3
 /usr/src/lib/libc/stdlib/random.3
 /usr/src/lib/libc/net/rcmd.3
 /usr/src/lib/libcompat/4.3/re_comp.3
+/usr/src/gnu/lib/libreadline/readline.3
 /usr/src/lib/libc/stdlib/realloc.3
 /usr/src/lib/libc/stdlib/realpath.3
 /usr/src/lib/libc/db/man/recno.3
@@ -181,7 +192,8 @@
 /usr/src/lib/libc/net/resolver.3
 /usr/src/lib/libcompat/4.3/rexec.3
 /usr/src/lib/libc/string/rindex.3
-/usr/src/lib/libm/common_source/rint.3
+/usr/src/lib/msun/man/rint.3
+/usr/src/lib/libc/rpc/rpc.3
 /usr/src/lib/libc/locale/rune.3
 /usr/src/lib/libc/gen/scandir.3
 /usr/src/lib/libc/stdio/scanf.3
@@ -193,10 +205,10 @@
 /usr/src/lib/libc/gen/siginterrupt.3
 /usr/src/lib/libc/gen/signal.3
 /usr/src/lib/libc/gen/sigsetops.3
-/usr/src/lib/libm/common_source/sin.3
-/usr/src/lib/libm/common_source/sinh.3
+/usr/src/lib/msun/man/sin.3
+/usr/src/lib/msun/man/sinh.3
 /usr/src/lib/libc/gen/sleep.3
-/usr/src/lib/libm/common_source/sqrt.3
+/usr/src/lib/msun/man/sqrt.3
 /usr/src/share/man/man3/stdarg.3
 /usr/src/lib/libc/stdio/stdio.3
 /usr/src/lib/libc/string/strcasecmp.3
@@ -208,7 +220,7 @@
 /usr/src/lib/libc/string/strcspn.3
 /usr/src/lib/libc/string/strdup.3
 /usr/src/lib/libc/string/strerror.3
-/usr/src/lib/libc/string/strftime.3
+/usr/src/lib/libc/stdtime/strftime.3
 /usr/src/lib/libc/string/string.3
 /usr/src/lib/libc/string/strlen.3
 /usr/src/lib/libc/string/strmode.3
@@ -228,15 +240,16 @@
 /usr/src/lib/libc/gen/sysctl.3
 /usr/src/lib/libc/gen/syslog.3
 /usr/src/lib/libc/stdlib/system.3
-/usr/src/lib/libm/common_source/tan.3
-/usr/src/lib/libm/common_source/tanh.3
+/usr/src/lib/msun/man/tan.3
+/usr/src/lib/msun/man/tanh.3
 /usr/src/lib/libc/gen/tcgetpgrp.3
 /usr/src/lib/libc/gen/tcsendbreak.3
 /usr/src/lib/libc/gen/tcsetattr.3
 /usr/src/lib/libc/gen/tcsetpgrp.3
-/usr/src/lib/libterm/termcap.3
-/usr/src/kerberosIV/man/tf_util.3
+/usr/src/lib/libtermcap/termcap.3
+/usr/src/eBones/man/tf_util.3
 /usr/src/lib/libc/gen/time.3
+/usr/src/lib/libc/stdtime/time2posix.3
 /usr/src/lib/libc/gen/times.3
 /usr/src/lib/libc/gen/timezone.3
 /usr/src/lib/libc/stdio/tmpnam.3
@@ -255,3 +268,5 @@
 /usr/src/lib/libc/gen/vis.3
 /usr/src/lib/libcompat/4.1/vlimit.3
 /usr/src/lib/libcompat/4.1/vtimes.3
+/usr/src/lib/libc/xdr/xdr.3
+/usr/src/usr.bin/compress/zopen.3
diff --git a/share/man/man0/man4 b/share/man/man0/man4
index 4113309503d..fb33ce0f098 100644
--- a/share/man/man0/man4
+++ b/share/man/man0/man4
@@ -1,51 +1,52 @@
-/usr/src/share/man/man4/man4.hp300/intro.4
-/usr/src/share/man/man4/netintro.4
-/usr/src/share/man/man4/man4.hp300/autoconf.4
-/usr/src/share/man/man4/man4.sparc/bwtwo.4
-/usr/src/share/man/man4/man4.sparc/cgsix.4
-/usr/src/share/man/man4/man4.sparc/cgthree.4
+/usr/src/share/man/man4/man4.i386/aha.4
+/usr/src/share/man/man4/man4.i386/ahb.4
+/usr/src/share/man/man4/apm.4
+/usr/src/usr.sbin/arp/arp.4
+/usr/src/share/man/man4/man4.i386/bt.4
 /usr/src/share/man/man4/clnp.4
 /usr/src/share/man/man4/cltp.4
-/usr/src/share/man/man4/man4.hp300/cons.4
-/usr/src/share/man/man4/man4.hp300/ct.4
-/usr/src/share/man/man4/man4.hp300/dca.4
-/usr/src/share/man/man4/man4.hp300/dcl.4
-/usr/src/share/man/man4/man4.hp300/dcm.4
+/usr/src/share/man/man4/man4.i386/cx.4
 /usr/src/share/man/man4/drum.4
-/usr/src/share/man/man4/man4.hp300/dv.4
+/usr/src/share/man/man4/man4.i386/ed.4
 /usr/src/share/man/man4/esis.4
 /usr/src/lib/libc/locale/euc.4
 /usr/src/share/man/man4/fd.4
-/usr/src/share/man/man4/man4.hp300/gb.4
-/usr/src/share/man/man4/man4.hp300/grf.4
-/usr/src/share/man/man4/man4.hp300/hil.4
+/usr/src/share/man/man4/man4.i386/fdc.4
 /usr/src/share/man/man4/icmp.4
 /usr/src/share/man/man4/idp.4
+/usr/src/share/man/man4/man4.i386/ie.4
 /usr/src/share/man/man4/inet.4
 /usr/src/share/man/man4/ip.4
+/usr/src/sbin/ipfw/ipfirewall.4
+/usr/src/share/man/man4/man4.i386/is.4
 /usr/src/share/man/man4/iso.4
-/usr/src/share/man/man4/man4.hp300/ite.4
-/usr/src/share/man/man4/man4.hp300/le.4
-/usr/src/share/man/man4/man4.sparc/le.4
+/usr/src/share/man/man4/man4.i386/keyboard.4
+/usr/src/share/man/man4/lkm.4
 /usr/src/share/man/man4/lo.4
-/usr/src/share/man/man4/man4.hp300/mem.4
-/usr/src/share/man/man4/man4.sparc/mem.4
+/usr/src/share/man/man4/man4.i386/lpt.4
+/usr/src/share/man/man4/man4.i386/mcd.4
+/usr/src/share/man/man4/man4.i386/mem.4
+/usr/src/share/man/man4/man4.i386/mse.4
+/usr/src/share/man/man4/netintro.4
+/usr/src/share/man/man4/man4.i386/npx.4
 /usr/src/share/man/man4/ns.4
 /usr/src/share/man/man4/nsip.4
 /usr/src/share/man/man4/null.4
-/usr/src/share/man/man4/man4.sparc/openprom.4
-/usr/src/share/man/man4/man4.hp300/ppi.4
 /usr/src/share/man/man4/pty.4
-/usr/src/share/man/man4/man4.hp300/rb.4
-/usr/src/share/man/man4/man4.hp300/rd.4
 /usr/src/share/man/man4/route.4
+/usr/src/share/man/man4/man4.i386/screen.4
+/usr/src/share/man/man4/man4.i386/sea.4
+/usr/src/share/man/man4/man4.i386/sio.4
+/usr/src/share/man/man4/man4.i386/spkr.4
 /usr/src/share/man/man4/spp.4
-/usr/src/share/man/man4/man4.hp300/st.4
-/usr/src/share/man/man4/man4.hp300/tc.4
 /usr/src/share/man/man4/tcp.4
 /usr/src/share/man/man4/termios.4
 /usr/src/share/man/man4/tp.4
 /usr/src/share/man/man4/tty.4
+/usr/src/share/man/man4/man4.i386/tw.4
 /usr/src/share/man/man4/udp.4
+/usr/src/share/man/man4/man4.i386/uha.4
 /usr/src/share/man/man4/unix.4
 /usr/src/lib/libc/locale/utf2.4
+/usr/src/share/man/man4/man4.i386/wd.4
+/usr/src/share/man/man4/yp.4
\ No newline at end of file
diff --git a/share/man/man0/man5 b/share/man/man0/man5
index 731023c66d9..050670f2bd1 100644
--- a/share/man/man0/man5
+++ b/share/man/man0/man5
@@ -1,54 +1,54 @@
 /usr/src/share/man/man5/a.out.5
 /usr/src/share/man/man5/acct.5
 /usr/src/usr.sbin/sendmail/src/aliases.5
-/usr/src/usr.bin/ar/ar.5.5
+/usr/src/usr.bin/ar/ar.5
+/usr/src/libexec/bootpd/bootptab.5
 /usr/src/share/man/man5/core.5
-/usr/src/usr.sbin/cron/crontab.5
+/usr/src/usr.sbin/cron/crontab/crontab.5
+/usr/src/gnu/usr.bin/cvs/cvs/cvs.5
 /usr/src/share/man/man5/dir.5
-/usr/src/sbin/disklabel/disklabel.5.5
+/usr/src/sbin/disklabel/disklabel.5
 /usr/src/share/man/man5/disktab.5
 /usr/src/games/dm/dm.conf.5
-/usr/src/share/man/man5/dump.5
-/usr/src/sbin/mountd/exports.5
+/usr/src/share/man/man5/fbtab.5
 /usr/src/share/man/man5/fs.5
 /usr/src/share/man/man5/fstab.5
 /usr/src/libexec/getty/gettytab.5
-/usr/src/contrib/groff-1.08/man/groff_font.5
-/usr/src/contrib/groff-1.08/man/groff_out.5
+/usr/src/gnu/usr.bin/groff/man/groff_font.5
+/usr/src/gnu/usr.bin/groff/man/groff_out.5
 /usr/src/share/man/man5/group.5
 /usr/src/share/man/man5/hosts.5
-/usr/src/kerberosIV/man/krb.conf.5
-/usr/src/kerberosIV/man/krb.realms.5
-/usr/src/usr.bin/uucp/man5/L-devices.5
-/usr/src/usr.bin/uucp/man5/L-dialcodes.5
-/usr/src/usr.bin/uucp/man5/L.aliases.5
-/usr/src/usr.bin/uucp/man5/L.cmds.5
-/usr/src/usr.bin/uucp/man5/L.sys.5
-/usr/src/usr.bin/man/man.conf.5
+/usr/src/eBones/man/krb.conf.5
+/usr/src/eBones/man/krb.realms.5
+/usr/src/share/man/man5/link.5
+/usr/src/usr.bin/login/login.access.5
+/usr/src/usr.bin/file/magic.5
 /usr/src/usr.bin/tn3270/mset/map3270.5
 /usr/src/sbin/mountd/netgroup.5
 /usr/src/share/man/man5/networks.5
 /usr/src/share/man/man5/passwd.5
 /usr/src/share/man/man5/phones.5
-/usr/src/share/man/man5/plot.5
 /usr/src/share/man/man5/printcap.5
+/usr/src/share/man/man5/procfs.5
 /usr/src/share/man/man5/protocols.5
-/usr/src/lib/librpc/secure_rpc/man/publickey.5
-/usr/src/usr.bin/ranlib/ranlib.5.5
-/usr/src/contrib/rcs-V5.6/man/rcsfile.5
+/usr/src/secure/lib/secure_rpc/man/publickey.5
+/usr/src/usr.bin/ranlib/ranlib.5
+/usr/src/gnu/usr.bin/rcs/rcs/rcsfile.5
 /usr/src/share/man/man5/remote.5
 /usr/src/share/man/man5/resolver.5
-/usr/src/lib/librpc/man/man5/rpc.5
+/usr/src/lib/libc/rpc/rpc.5
 /usr/src/share/man/man5/services.5
 /usr/src/share/man/man5/shells.5
+/usr/src/lib/libskey/skey.access.5
+/usr/src/share/man/man5/skey.access.5
 /usr/src/share/man/man5/stab.5
 /usr/src/usr.sbin/syslogd/syslog.conf.5
-/usr/src/old/tar/tarformat.5
+/usr/src/lib/libncurses/term.5
 /usr/src/share/termcap/termcap.5
+/usr/src/lib/libncurses/terminfo.5
 /usr/src/libexec/getty/ttys.5
 /usr/src/share/man/man5/types.5
-/usr/src/share/zoneinfo/tzfile.5
-/usr/src/usr.bin/uucp/man5/USERFILE.5
+/usr/src/lib/libc/stdtime/tzfile.5
 /usr/src/share/man/man5/utmp.5
 /usr/src/usr.bin/uuencode/uuencode.format.5
-/usr/src/usr.bin/vgrind/vgrindefs.5
+/usr/src/usr.bin/vgrind/vgrindefs.5
\ No newline at end of file
diff --git a/share/man/man0/man6 b/share/man/man0/man6
index 3ef02cf51df..fee66cd7a04 100644
--- a/share/man/man0/man6
+++ b/share/man/man0/man6
@@ -6,22 +6,19 @@
 /usr/src/games/battlestar/battlestar.6
 /usr/src/games/bcd/bcd.6
 /usr/src/games/boggle/boggle/boggle.6
+/usr/src/games/bs/bs.6
 /usr/src/games/caesar/caesar.6
 /usr/src/games/canfield/canfield/canfield.6
-/usr/src/games/chess/chess.6
-/usr/src/games/ching/ching.6
+/usr/src/gnu/games/chess/chess.6
 /usr/src/games/cribbage/cribbage.6
-/usr/src/contrib/dungeon/dungeon.6
 /usr/src/games/factor/factor.6
 /usr/src/games/fish/fish.6
 /usr/src/games/fortune/fortune/fortune.6
+/usr/src/games/grdc/grdc.6
 /usr/src/games/hack/hack.6
 /usr/src/games/hangman/hangman.6
-/usr/src/contrib/hunt/hunt.6
-/usr/src/contrib/hunt/huntd.6
 /usr/src/games/larn/larn.6
 /usr/src/games/mille/mille.6
-/usr/src/games/monop/monop.6
 /usr/src/games/number/number.6
 /usr/src/games/phantasia/phantasia.6
 /usr/src/games/pig/pig.6
@@ -38,5 +35,5 @@
 /usr/src/games/worm/worm.6
 /usr/src/games/worms/worms.6
 /usr/src/games/wump/wump.6
-/usr/src/games/xneko/xneko.6
-/usr/src/games/xroach/xroach.6
+/usr/src/games/x11/xneko/xneko.6
+/usr/src/games/x11/xroach/xroach.6
\ No newline at end of file
diff --git a/share/man/man0/man7 b/share/man/man0/man7
index 5683ebb3192..e60dbf40cd8 100644
--- a/share/man/man0/man7
+++ b/share/man/man0/man7
@@ -1,18 +1,16 @@
-/usr/src/share/man/man7/intro.7
 /usr/src/share/man/man7/ascii.7
 /usr/src/share/man/man7/environ.7
-/usr/src/share/man/man7/eqnchar.7
-/usr/src/contrib/groff-1.08/man/groff_char.7
+/usr/src/gnu/usr.bin/groff/man/groff_char.7
+/usr/src/gnu/usr.bin/groff/mm/groff_mm.7
+/usr/src/gnu/usr.bin/groff/mm/groff_mmse.7
+/usr/src/gnu/usr.bin/groff/tmac/groff_ms.7
 /usr/src/share/man/man7/hier.7
 /usr/src/share/man/man7/hostname.7
+/usr/src/share/man/man7/intro.7
 /usr/src/share/man/man7/mailaddr.7
-/usr/src/share/man/man7/man.7
 /usr/src/share/man/man7/mdoc.7
 /usr/src/share/man/man7/mdoc.samples.7
 /usr/src/share/me/me.7
-/usr/src/contrib/groff-1.08/mm/mm.7
-/usr/src/share/man/man7/ms.7
 /usr/src/share/man/man7/operator.7
 /usr/src/lib/libc/regex/re_format.7
-/usr/src/bin/ln/symlink.7
-/usr/src/share/man/man7/term.7
+/usr/src/bin/ln/symlink.7
\ No newline at end of file
diff --git a/share/man/man0/man8 b/share/man/man0/man8
index 1b92703dd86..e756076257f 100644
--- a/share/man/man0/man8
+++ b/share/man/man0/man8
@@ -1,24 +1,36 @@
-/usr/src/share/man/man8/intro.8
+/usr/src/share/man/man8/man8.i386/MAKEDEV.8
+/usr/src/usr.sbin/XNSrouted/XNSrouted.8
 /usr/src/usr.sbin/ac/ac.8
-/usr/src/usr.bin/uucp/acucntrl/acucntrl.8
-/usr/src/share/man/man8/adduser.8
+/usr/src/usr.sbin/accton/accton.8
+/usr/src/share/man/man8/adding_user.8
+/usr/src/usr.sbin/adduser/adduser.8
+/usr/src/sbin/adjkerntz/adjkerntz.8
 /usr/src/usr.sbin/amd/amd/amd.8
 /usr/src/usr.sbin/amd/amq/amq.8
+/usr/src/usr.sbin/apm/apm.8
+/usr/src/usr.sbin/apmconf/apmconf.8
 /usr/src/usr.sbin/arp/arp.8
+/usr/src/libexec/atrun/atrun.8
 /usr/src/usr.sbin/bad144/bad144.8
 /usr/src/sbin/badsect/badsect.8
 /usr/src/sbin/reboot/boot_hp300.8
+/usr/src/sbin/reboot/boot_i386.8
 /usr/src/sbin/reboot/boot_sparc.8
-/usr/src/libexec/bugfiler/bugfiler.8
+/usr/src/sbin/reboot/boot_tahoe.8
+/usr/src/sbin/reboot/boot_vax.8
+/usr/src/libexec/bootpd/bootpd.8
+/usr/src/libexec/bootpd/tools/bootpef/bootpef.8
+/usr/src/libexec/bootpd/tools/bootptest/bootptest.8
+/usr/src/usr.bin/chat/chat.8
 /usr/src/usr.sbin/chown/chown.8
 /usr/src/usr.sbin/chroot/chroot.8
 /usr/src/sbin/clri/clri.8
+/usr/src/sbin/i386/comcontrol/comcontrol.8
 /usr/src/libexec/comsat/comsat.8
 /usr/src/usr.sbin/config/config.8
 /usr/src/usr.sbin/config.new/config.new.8
-/usr/src/share/man/man8/man8.hp300/crash.8
-/usr/src/usr.sbin/cron/cron.8
-/usr/src/usr.sbin/dev_mkdb/dev_mkdb.8
+/usr/src/usr.sbin/cron/cron/cron.8
+/usr/src/sbin/i386/cxconfig/cxconfig.8
 /usr/src/sbin/disklabel/disklabel.8
 /usr/src/usr.sbin/diskpart/diskpart.8
 /usr/src/games/dm/dm.8
@@ -28,46 +40,56 @@
 /usr/src/sbin/dumplfs/dumplfs.8
 /usr/src/usr.sbin/edquota/edquota.8
 /usr/src/usr.sbin/eeprom/eeprom.8
-/usr/src/kerberosIV/man/ext_srvtab.8
-/usr/src/sbin/fastboot/fastboot.8
+/usr/src/eBones/man/ext_srvtab.8
+/usr/src/usr.sbin/fdcontrol/fdcontrol.8
+/usr/src/sbin/i386/fdisk/fdisk.8
 /usr/src/libexec/fingerd/fingerd.8
-/usr/src/share/man/man8/man8.hp300/format.8
 /usr/src/sbin/fsck/fsck.8
-/usr/src/sbin/fsdb/fsdb.8
 /usr/src/usr.sbin/amd/fsinfo/fsinfo.8
+/usr/src/sbin/i386/ft/ft.8
 /usr/src/libexec/ftpd/ftpd.8
 /usr/src/libexec/getty/getty.8
-/usr/src/sbin/icheck/icheck.8
 /usr/src/sbin/ifconfig/ifconfig.8
 /usr/src/usr.sbin/inetd/inetd.8
 /usr/src/sbin/init/init.8
+/usr/src/share/man/man8/intro.8
 /usr/src/usr.sbin/iostat/iostat.8
-/usr/src/kerberosIV/man/kdb_destroy.8
-/usr/src/kerberosIV/man/kdb_edit.8
-/usr/src/kerberosIV/man/kdb_init.8
-/usr/src/kerberosIV/man/kdb_util.8
+/usr/src/sbin/ipfw/ipfw.8
+/usr/src/eBones/man/kadmin.8
+/usr/src/eBones/man/kadmind.8
+/usr/src/eBones/man/kdb_destroy.8
+/usr/src/eBones/man/kdb_edit.8
+/usr/src/eBones/man/kdb_init.8
+/usr/src/eBones/man/kdb_util.8
 /usr/src/usr.sbin/kgmon/kgmon.8
+/usr/src/eBones/man/klogind.8
 /usr/src/libexec/kpasswdd/kpasswdd.8
-/usr/src/kerberosIV/man/kstash.8
+/usr/src/eBones/man/kshd.8
+/usr/src/eBones/man/ksrvutil.8
+/usr/src/eBones/man/kstash.8
 /usr/src/usr.sbin/kvm_mkdb/kvm_mkdb.8
+/usr/src/gnu/usr.bin/ld/ldconfig/ldconfig.8
 /usr/src/libexec/lfs_cleanerd/lfs_cleanerd.8
 /usr/src/usr.sbin/lpr/lpc/lpc.8
 /usr/src/usr.sbin/lpr/lpd/lpd.8
+/usr/src/usr.sbin/lptcontrol/lptcontrol.8
+/usr/src/usr.sbin/lsdev/lsdev.8
 /usr/src/libexec/mail.local/mail.local.8
-/usr/src/kerberosIV/make_keypair/make_keypair.8
+/usr/src/eBones/make_keypair/make_keypair.8
 /usr/src/share/man/man8/makedev.8
-/usr/src/share/man/man8/man8.hp300/MAKEDEV.8
 /usr/src/libexec/makekey/makekey.8
 /usr/src/usr.sbin/sendmail/makemap/makemap.8
-/usr/src/contrib/mh-6.8.3a/conf/mh-gen.8
 /usr/src/usr.sbin/amd/mk-amd-map/mk-amd-map.8
 /usr/src/sbin/mknod/mknod.8
-/usr/src/usr.sbin/mkproto/mkproto.8
+/usr/src/sbin/modload/modload.8
+/usr/src/usr.bin/modstat/modstat.8
+/usr/src/sbin/modunload/modunload.8
 /usr/src/sbin/mount/mount.8
 /usr/src/sbin/mount_cd9660/mount_cd9660.8
 /usr/src/sbin/mount_fdesc/mount_fdesc.8
 /usr/src/sbin/mount_kernfs/mount_kernfs.8
 /usr/src/sbin/mount_lfs/mount_lfs.8
+/usr/src/sbin/i386/mount_msdos/mount_msdos.8
 /usr/src/sbin/mount_nfs/mount_nfs.8
 /usr/src/sbin/mount_null/mount_null.8
 /usr/src/sbin/mount_portal/mount_portal.8
@@ -75,21 +97,27 @@
 /usr/src/sbin/mount_umap/mount_umap.8
 /usr/src/sbin/mount_union/mount_union.8
 /usr/src/sbin/mountd/mountd.8
+/usr/src/usr.sbin/mrouted/mrouted.8
 /usr/src/usr.sbin/mtree/mtree.8
-/usr/src/contrib/bind-4.9.2/man/named.8
-/usr/src/contrib/bind-4.9.2/man/named-xfer.8
-/usr/src/contrib/bind-4.9.2/man/named.reload.8
-/usr/src/contrib/bind-4.9.2/man/named.restart.8
-/usr/src/sbin/ncheck/ncheck.8
+/usr/src/usr.sbin/named/xfer/named-xfer.8
+/usr/src/usr.sbin/named/named.8
+/usr/src/usr.sbin/named/tools/named.reload/named.reload.8
+/usr/src/usr.sbin/named/tools/named.restart/named.restart.8
+/usr/src/usr.sbin/ncrcontrol/ncrcontrol.8
 /usr/src/sbin/newfs/newfs.8
 /usr/src/sbin/newlfs/newlfs.8
 /usr/src/sbin/nfsd/nfsd.8
 /usr/src/sbin/nfsiod/nfsiod.8
 /usr/src/sbin/nologin/nologin.8
-/usr/src/contrib/bind-4.9.2/man/nslookup.8
+/usr/src/usr.sbin/nslookup/nslookup.8
+/usr/src/usr.sbin/xntpd/doc/ntpdate.8
+/usr/src/usr.sbin/xntpd/doc/ntpq.8
+/usr/src/usr.sbin/xntpd/doc/ntptrace.8
 /usr/src/usr.sbin/lpr/pac/pac.8
 /usr/src/sbin/ping/ping.8
 /usr/src/usr.sbin/portmap/portmap.8
+/usr/src/usr.sbin/pppd/pppd.8
+/usr/src/usr.sbin/pppstats/pppstats.8
 /usr/src/usr.sbin/pstat/pstat.8
 /usr/src/usr.sbin/pwd_mkdb/pwd_mkdb.8
 /usr/src/usr.sbin/quot/quot.8
@@ -97,8 +125,9 @@
 /usr/src/usr.sbin/quotaon/quotaon.8
 /usr/src/libexec/rbootd/rbootd.8
 /usr/src/share/man/man8/rc.8
+/usr/src/sbin/rdisc/rdisc.8
 /usr/src/sbin/reboot/reboot.8
-/usr/src/kerberosIV/registerd/registerd.8
+/usr/src/eBones/registerd/registerd.8
 /usr/src/usr.bin/renice/renice.8
 /usr/src/usr.sbin/repquota/repquota.8
 /usr/src/sbin/restore/restore.8
@@ -107,8 +136,13 @@
 /usr/src/bin/rmail/rmail.8
 /usr/src/usr.sbin/rmt/rmt.8
 /usr/src/sbin/route/route.8
-/usr/src/sbin/routed/routed.8
+/usr/src/usr.sbin/routed/routed.8
+/usr/src/libexec/rpc.rstatd/rpc.rstatd.8
+/usr/src/libexec/rpc.rusersd/rpc.rusersd.8
+/usr/src/libexec/rpc.rwalld/rpc.rwalld.8
+/usr/src/usr.bin/rpcinfo/rpcinfo.8
 /usr/src/libexec/rshd/rshd.8
+/usr/src/lib/libc/rpc/rstat_svc.8
 /usr/src/usr.sbin/rwhod/rwhod.8
 /usr/src/usr.sbin/sa/sa.8
 /usr/src/sbin/savecore/savecore.8
@@ -118,14 +152,18 @@
 /usr/src/sbin/shutdown/shutdown.8
 /usr/src/sbin/slattach/slattach.8
 /usr/src/usr.sbin/sliplogin/sliplogin.8
+/usr/src/usr.sbin/slstat/slstat.8
 /usr/src/share/man/man8/sticky.8
+/usr/src/games/fortune/strfile/strfile.8
 /usr/src/sbin/swapon/swapon.8
 /usr/src/bin/sync/sync.8
 /usr/src/usr.sbin/sysctl/sysctl.8
 /usr/src/usr.sbin/syslogd/syslogd.8
 /usr/src/libexec/talkd/talkd.8
 /usr/src/libexec/telnetd/telnetd.8
+/usr/src/secure/libexec/telnetd/telnetd.8
 /usr/src/libexec/tftpd/tftpd.8
+/usr/src/usr.sbin/xntpd/doc/tickadj.8
 /usr/src/usr.sbin/timed/timed/timed.8
 /usr/src/usr.sbin/timed/timedc/timedc.8
 /usr/src/usr.sbin/traceroute/traceroute.8
@@ -133,13 +171,13 @@
 /usr/src/usr.sbin/trsp/trsp.8
 /usr/src/sbin/tunefs/tunefs.8
 /usr/src/sbin/umount/umount.8
-/usr/src/usr.sbin/update/update.8
-/usr/src/usr.bin/uucp/uucico/uucico.8
-/usr/src/usr.bin/uucp/uuclean/uuclean.8
-/usr/src/usr.bin/uucp/uupoll/uupoll.8
-/usr/src/usr.bin/uucp/uusnap/uusnap.8
-/usr/src/usr.bin/uucp/uuxqt/uuxqt.8
+/usr/src/gnu/libexec/uucp/uucico/uucico.8
+/usr/src/gnu/libexec/uucp/uuxqt/uuxqt.8
 /usr/src/usr.sbin/vipw/vipw.8
 /usr/src/usr.bin/vmstat/vmstat.8
-/usr/src/sbin/XNSrouted/XNSrouted.8
-/usr/src/share/zoneinfo/zic.8
+/usr/src/usr.sbin/vnconfig/vnconfig.8
+/usr/src/usr.sbin/xntpd/doc/xntpd.8
+/usr/src/usr.sbin/xntpd/doc/xntpdc.8
+/usr/src/libexec/xtend/xtend.8
+/usr/src/usr.sbin/zic/zdump.8
+/usr/src/usr.sbin/zic/zic.8
diff --git a/share/man/man0/title.prm b/share/man/man0/title.prm
index 20b11063b67..3444539d7c0 100644
--- a/share/man/man0/title.prm
+++ b/share/man/man0/title.prm
@@ -36,13 +36,13 @@
 .sp 2.75i
 .ft B
 .ce 2
-UNIX Programmer's Reference Manual
+FreeBSD Programmer's Reference Manual
 (PRM)
 .ps 14
 .vs 16
 .sp |4i
 .ce 2
-4.4 Berkeley Software Distribution
+For FreeBSD version 2.1
 .sp |5.75i
 .ft R
 .pt 12
@@ -51,11 +51,8 @@ UNIX Programmer's Reference Manual
 June, 1993
 .sp |8.2i
 .ce 5
-Computer Systems Research Group
-Computer Science Division
-Department of Electrical Engineering and Computer Science
-University of California
-Berkeley, California  94720
+The FreeBSD Project
+<hackers@FreeBSD.ORG>
 .bp
 \&
 .sp |1i
@@ -128,16 +125,6 @@ Business Equipment Manufacturers Association (CBEMA), 311 First St., NW,
 Suite 500, Washington, DC 20001-2178.  The developmental work of
 Programming Language C was completed by the X3J11 Technical Committee.''
 .sp 2
-Manual pages ptrace.2, ecvt.3, mp.3, plot.3, L-devices.5, L-dialcodes.5,
-L.aliases.5, L.cmds.5, L.sys.5, USERFILE.5, dump.5, and plot.5
-are copyright 1979, AT&T Bell Laboratories, Incorporated.
-Holders of \x'-1p'UNIX\v'-4p'\s-3TM\s0\v'4p'/32V,
-System III, or System V software licenses are
-permitted to copy these documents, or any portion of them,
-as necessary for licensed use of the software,
-provided this copyright notice and statement of permission
-are included.
-.sp 2
 The views and conclusions contained in this manual are those of the
 authors and should not be interpreted as representing official policies,
 either expressed or implied, of the Regents of the University of California.
diff --git a/share/man/man0/title.urm b/share/man/man0/title.urm
index 237ab2ed225..0e307f119c3 100644
--- a/share/man/man0/title.urm
+++ b/share/man/man0/title.urm
@@ -43,7 +43,7 @@
 .LP
 .ft B
 .ce 2
-UNIX User's Reference Manual
+FreeBSD User's Reference Manual
 (URM)
 .nr LL 5.5i
 .nr PO 1.5i
@@ -53,6 +53,7 @@ UNIX User's Reference Manual
 .nr PS 11
 .nr VS 13
 .LP
+This stiff doesn't really belong here...
 The USENIX Association,
 the UNIX and Advanced Computing Systems professional and technical organization,
 is a not-for-profit membership association of individuals and
@@ -80,34 +81,31 @@ Conference and Workshop Proceedings, and a Book Series.
 .LP
 .ft B
 .ce 2
-UNIX User's Reference Manual
+FreeBSD User's Reference Manual
 (URM)
 .sp |4i
 .ce 2
-4.4 Berkeley Software Distribution
-(June, 1993)
+For FreeBSD version 2.1
+(March, 1995)
 .sp 3
 .nr PS 15
 .nr VS 18
 .LP
 .ce 2
-Computer Systems Research Group
-University of California, Berkeley
+The FreeBSD Project
+<hackers@FreeBSD.ORG>
 .sp |8.2i
 .nr PS 12
 .nr VS 15
 .LP
 .ce 4
-A USENIX Association Book
-The MIT Press
-Cambridge, Massachusetts
-London, England
+foo - publisher?
 .bp
 .hy 0
 .nr PS 9
 .nr VS 11
 .LP
-First Printing, 1993
+First Printing, 1995
 .sp 1
 .LP
 Copyright 1979, 1980, 1983, 1986, 1993
@@ -177,27 +175,12 @@ Suite 500, Washington, DC 20001-2178.  The developmental work of
 Programming Language C was completed by the X3J11 Technical Committee.''
 .sp 1
 .LP
-Manual pages adb.1, bc.1, compact.1, crypt.1, dc.1, deroff.1, ed.1,
-expr.1, graph.1, ld.1, learn.1, m4.1, plot.1, ptx.1, spell.1,
-spline.1, struct.1, tar.1, units.1, uucp.1, uux.1, ching.6, eqnchar.7,
-man.7, ms.7, and term.7
-are copyright 1979, AT&T Bell Laboratories, Incorporated.
-Holders of \x'-1p'UNIX\v'-4p'\s-3TM\s0\v'4p'/32V,
-System III, or System V software licenses are
-permitted to copy these documents, or any portion of them,
-as necessary for licensed use of the software,
-provided this copyright notice and statement of permission
-are included.
-.sp 1
-.LP
 The views and conclusions contained in this manual are those of the
 authors and should not be interpreted as representing official policies,
 either expressed or implied, of the Regents of the University of California.
 .sp 1
 .LP
 This book was printed and bound in the United States of America.
-.br
-Distributed by The MIT Press.
 .bp
 \&
 .sp |1.5i
diff --git a/share/man/man0/tocrc b/share/man/man0/tocrc
index 182e00401b8..41b43f7f060 100755
--- a/share/man/man0/tocrc
+++ b/share/man/man0/tocrc
@@ -55,7 +55,7 @@ fi
 
 cat tocx* cshcmd > /tmp/cattoc
 
-ptx -r -t -b break -f -w 108 -i ignore /tmp/cattoc ptxx
+ptx -G -r -t -b break -f -w 108 -i ignore /tmp/cattoc ptxx
 
 for x in 1 2 3 4 5 6 7 8; do
 	grep '^intro' <tocx$x >$tmp