57 files changed, 834 insertions, 67 deletions

diff --git a/sbin/badsect/Makefile b/sbin/badsect/Makefile
index ff9f4f1d22cb..9ddb3f731816 100644
--- a/sbin/badsect/Makefile
+++ b/sbin/badsect/Makefile
@@ -1,6 +1,6 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
 
 PROG=	badsect
-MAN8=	badsect.0
+MAN8=	badsect.8
 
 .include <bsd.prog.mk>
diff --git a/sbin/bsdlabel/Makefile b/sbin/bsdlabel/Makefile
index 177e3e4a9559..bf77cff4c2cf 100644
--- a/sbin/bsdlabel/Makefile
+++ b/sbin/bsdlabel/Makefile
@@ -2,6 +2,7 @@
 
 PROG=	disklabel
 SRCS=	disklabel.c dkcksum.c
-MAN8=	disklabel.0
+MAN8=	disklabel.8
+MAN5=	disklabel.5
 
 .include <bsd.prog.mk>
diff --git a/sbin/bsdlabel/bsdlabel.5 b/sbin/bsdlabel/bsdlabel.5
new file mode 100644
index 000000000000..fb6f6cd14d58
--- /dev/null
+++ b/sbin/bsdlabel/bsdlabel.5
@@ -0,0 +1,384 @@
+.\" Copyright (c) 1987, 1991, 1993
+.\"	The Regents of the University of California.  All rights reserved.
+.\"
+.\" This code is derived from software contributed to Berkeley by
+.\" Symmetric Computer Systems.
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\" 1. Redistributions of source code must retain the above copyright
+.\"    notice, this list of conditions and the following disclaimer.
+.\" 2. Redistributions in binary form must reproduce the above copyright
+.\"    notice, this list of conditions and the following disclaimer in the
+.\"    documentation and/or other materials provided with the distribution.
+.\" 3. All advertising materials mentioning features or use of this software
+.\"    must display the following acknowledgement:
+.\"	This product includes software developed by the University of
+.\"	California, Berkeley and its contributors.
+.\" 4. Neither the name of the University nor the names of its contributors
+.\"    may be used to endorse or promote products derived from this software
+.\"    without specific prior written permission.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
+.\"
+.\"     @(#)disklabel.5.5	8.1 (Berkeley) 6/5/93
+.\"
+.Dd June 5, 1993
+.Dt DISKLABEL 5
+.Os
+.Sh NAME
+.Nm disklabel
+.Nd disk pack label
+.Sh SYNOPSIS
+.Fd #include <sys/disklabel.h>
+.Sh DESCRIPTION
+Each disk or disk pack on a system may contain a disk label
+which provides detailed information
+about the geometry of the disk and the partitions into which the disk
+is divided.
+It should be initialized when the disk is formatted,
+and may be changed later with the
+.Xr disklabel 8
+program.
+This information is used by the system disk driver and by the bootstrap
+program to determine how to program the drive
+and where to find the filesystems on the disk partitions.
+Additional information is used by the filesystem in order
+to use the disk most efficiently and to locate important filesystem information.
+The description of each partition contains an identifier for the partition
+type (standard filesystem, swap area, etc.).
+The filesystem updates the in-core copy of the label if it contains
+incomplete information about the filesystem.
+.Pp
+The label is located in sector number
+.Dv LABELSECTOR
+of the drive, usually sector 0 where it may be found
+without any information about the disk geometry.
+It is at an offset
+.Dv LABELOFFSET
+from the beginning of the sector, to allow room for the initial bootstrap.
+The disk sector containing the label is normally made read-only
+so that it is not accidentally overwritten by pack-to-pack copies
+or swap operations;
+the
+.Dv DIOCWLABEL
+.Xr ioctl 2 ,
+which is done as needed by the
+.Xr disklabel
+program.
+.Pp
+A copy of the in-core label for a disk can be obtained with the
+.Dv DIOCGDINFO
+.Xr ioctl ;
+this works with a file descriptor for a block or character (``raw'') device
+for any partition of the disk.
+The in-core copy of the label is set by the 
+.Dv DIOCSDINFO
+.Xr ioctl .
+The offset of a partition cannot generally be changed while it is open,
+nor can it be made smaller while it is open.
+One exception is that any change is allowed if no label was found
+on the disk, and the driver was able to construct only a skeletal label
+without partition information.
+Finally, the 
+.Dv DIOCWDINFO
+.Xr ioctl
+operation sets the in-core label and then updates the on-disk label;
+there must be an existing label on the disk for this operation to succeed.
+Thus, the initial label for a disk or disk pack must be installed
+by writing to the raw disk.
+All of these operations are normally done using
+.Xr disklabel .
+.Pp
+The format of the disk label, as specified in
+.Aw Pa sys/disklabel.h ,
+is
+.Bd -literal
+/*
+* Disk description table, see disktab(5)
+*/
+#define	DISKTAB		"/etc/disktab"
+
+/*
+* Each disk has a label which includes information about the hardware
+* disk geometry, filesystem partitions, and drive specific information.
+* The label is in block 0 or 1, possibly offset from the beginning
+* to leave room for a bootstrap, etc.
+*/
+
+#ifndef	LABELSECTOR
+#define LABELSECTOR	0			/* sector containing label */
+#endif
+
+#ifndef	LABELOFFSET
+#define LABELOFFSET	64			/* offset of label in sector */
+#endif
+
+#define DISKMAGIC	((u_long) 0x82564557)	/* The disk magic number */
+#ifndef MAXPARTITIONS
+#define	MAXPARTITIONS	8
+#endif
+
+#ifndef LOCORE
+struct disklabel {
+	u_long	d_magic;	/* the magic number */
+	short	d_type;		/* drive type */
+	short	d_subtype;	/* controller/d_type specific */
+	char	d_typename[16];	/* type name, e.g. "eagle" */
+	/* 
+	* d_packname contains the pack identifier and is returned when
+	* the disklabel is read off the disk or in-core copy.
+	* d_boot0 and d_boot1 are the (optional) names of the
+	* primary (block 0) and secondary (block 1-15) bootstraps
+	* as found in /usr/mdec.  These are returned when using
+	* getdiskbyname(3)
+	to retrieve the values from /etc/disktab.
+	*/
+#if defined(KERNEL) || defined(STANDALONE)
+	char	d_packname[16];		/* pack identifier */ 
+#else
+	union {
+		char	un_d_packname[16];	/* pack identifier */ 
+		struct {
+			char *un_d_boot0;	/* primary bootstrap name */
+			char *un_d_boot1;	/* secondary bootstrap name */
+		} un_b; 
+	} d_un; 
+
+#define d_packname	d_un.un_d_packname
+#define d_boot0		d_un.un_b.un_d_boot0
+#define d_boot1		d_un.un_b.un_d_boot1
+#endif	/* ! KERNEL or STANDALONE */
+
+	/* disk geometry: */
+	u_long	d_secsize;	/* # of bytes per sector */
+	u_long	d_nsectors;	/* # of data sectors per track */
+	u_long	d_ntracks;	/* # of tracks per cylinder */
+	u_long	d_ncylinders;	/* # of data cylinders per unit */
+	u_long	d_secpercyl;	/* # of data sectors per cylinder */
+	u_long	d_secperunit;	/* # of data sectors per unit */
+	/*
+	* Spares (bad sector replacements) below
+	* are not counted in d_nsectors or d_secpercyl.
+	* Spare sectors are assumed to be physical sectors
+	* which occupy space at the end of each track and/or cylinder.
+	*/
+	u_short	d_sparespertrack;	/* # of spare sectors per track */
+	u_short	d_sparespercyl;	/* # of spare sectors per cylinder */
+	/*
+	* Alternate cylinders include maintenance, replacement,
+	* configuration description areas, etc.
+	*/
+	u_long	d_acylinders;	/* # of alt. cylinders per unit */
+
+		/* hardware characteristics: */
+	/*
+	* d_interleave, d_trackskew and d_cylskew describe perturbations
+	* in the media format used to compensate for a slow controller.
+	* Interleave is physical sector interleave, set up by the formatter
+	* or controller when formatting.  When interleaving is in use,
+	* logically adjacent sectors are not physically contiguous,
+	* but instead are separated by some number of sectors.
+	* It is specified as the ratio of physical sectors traversed
+	* per logical sector.  Thus an interleave of 1:1 implies contiguous
+	* layout, while 2:1 implies that logical sector 0 is separated
+	* by one sector from logical sector 1.
+	* d_trackskew is the offset of sector 0 on track N
+	* relative to sector 0 on track N-1 on the same cylinder.
+	* Finally, d_cylskew is the offset of sector 0 on cylinder N
+	* relative to sector 0 on cylinder N-1.
+	*/
+	u_short	d_rpm;	/* rotational speed */
+	u_short	d_interleave;	/* hardware sector interleave */
+	u_short	d_trackskew;	/* sector 0 skew, per track */
+	u_short	d_cylskew;	/* sector 0 skew, per cylinder */
+	u_long	d_headswitch;	/* head switch time, usec */
+	u_long	d_trkseek;	/* track-to-track seek, usec */
+	u_long	d_flags;	/* generic flags */
+#define NDDATA 5
+	u_long	d_drivedata[NDDATA];	/* drive-type specific information */
+#define NSPARE 5
+	u_long	d_spare[NSPARE];	/* reserved for future use */
+	u_long	d_magic2;	/* the magic number (again) */
+	u_short	d_checksum;	/* xor of data incl. partitions */
+
+	/* filesystem and partition information: */
+	u_short	d_npartitions;	/* number of partitions in following */
+	u_long	d_bbsize;	/* size of boot area at sn0, bytes */
+	u_long	d_sbsize;	/* max size of fs superblock, bytes */
+	struct	partition {	/* the partition table */
+		u_long	p_size;	/* number of sectors in partition */
+		u_long	p_offset;	/* starting sector */
+		u_long	p_fsize;	/* filesystem basic fragment size */
+		u_char	p_fstype;	/* filesystem type, see below */
+		u_char	p_frag;	/* filesystem fragments per block */
+		union {
+			u_short	cpg;	/* UFS: FS cylinders per group */
+			u_short	sgs;	/* LFS: FS segment shift */
+		} __partition_u1;
+#define	p_cpg	__partition_u1.cpg
+#define	p_sgs	__partition_u1.sgs
+		u_short	p_cpg;	/* filesystem cylinders per group */
+	} d_partitions[MAXPARTITIONS];	/* actually may be more */
+};
+
+/* d_type values: */
+#define	DTYPE_SMD	1	/* SMD, XSMD; VAX hp/up */
+#define	DTYPE_MSCP	2	/* MSCP */
+#define	DTYPE_DEC	3	/* other DEC (rk, rl) */
+#define	DTYPE_SCSI	4	/* SCSI */
+#define	DTYPE_ESDI	5	/* ESDI interface */
+#define	DTYPE_ST506	6	/* ST506 etc. */
+#define	DTYPE_HPIB	7	/* CS/80 on HP-IB */
+#define	DTYPE_HPFL	8	/* HP Fiber-link */
+#define	DTYPE_FLOPPY	10	/* floppy */
+
+#ifdef DKTYPENAMES
+static char *dktypenames[] = {
+	"unknown",
+	"SMD",
+	"MSCP",
+	"old DEC",
+	"SCSI",
+	"ESDI",
+	"ST506",
+	"HP-IB",
+	"HP-FL",
+	"type 9",
+	"floppy",
+	0
+};
+#define DKMAXTYPES	(sizeof(dktypenames) / sizeof(dktypenames[0]) - 1)
+#endif
+
+/*
+* Filesystem type and version.
+* Used to interpret other filesystem-specific
+* per-partition information.
+*/
+#define	FS_UNUSED	0	/* unused */
+#define	FS_SWAP		1	/* swap */
+#define	FS_V6		2	/* Sixth Edition */
+#define	FS_V7		3	/* Seventh Edition */
+#define	FS_SYSV		4	/* System V */
+#define	FS_V71K		5	/* V7 with 1K blocks (4.1, 2.9) */
+#define	FS_V8		6	/* Eighth Edition, 4K blocks */
+#define	FS_BSDFFS	7	/* 4.2BSD fast file system */
+#define	FS_MSDOS	8	/* MSDOS file system */
+#define	FS_BSDLFS	9	/* 4.4BSD log-structured file system */
+#define	FS_OTHER	10	/* in use, but unknown/unsupported */
+#define	FS_HPFS		11	/* OS/2 high-performance file system */
+#define	FS_ISO9660	12	/* ISO 9660, normally CD-ROM */
+#define	FS_BOOT		13	/* partition contains bootstrap */
+
+#ifdef	DKTYPENAMES
+static char *fstypenames[] = {
+	"unused",
+	"swap",
+	"Version 6",
+	"Version 7",
+	"System V",
+	"4.1BSD",
+	"Eighth Edition",
+	"4.2BSD",
+	"MSDOS",
+	"4.4LFS",
+	"unknown",
+	"HPFS",
+	"ISO9660",
+	"boot",
+	0
+};
+#define FSMAXTYPES	(sizeof(fstypenames) / sizeof(fstypenames[0]) - 1)
+#endif
+
+/*
+* flags shared by various drives:
+*/
+#define	D_REMOVABLE	0x01	/* removable media */
+#define	D_ECC		0x02	/* supports ECC */
+#define	D_BADSECT	0x04	/* supports bad sector forw. */
+#define	D_RAMDISK	0x08	/* disk emulator */
+#define	D_CHAIN		0x10	/* can do back-back transfers */
+
+/*
+* Drive data for SMD.
+*/
+
+#define	d_smdflags	d_drivedata[0]
+#define	D_SSE		0x1	/* supports skip sectoring */
+#define	d_mindist	d_drivedata[1]
+#define	d_maxdist	d_drivedata[2]
+#define	d_sdist		d_drivedata[3]
+
+/*
+* Drive data for ST506.
+*/
+#define d_precompcyl	d_drivedata[0]
+#define d_gap3		d_drivedata[1]	/* used only when formatting */
+
+/*
+ * Drive data for SCSI.
+ */
+#define	d_blind		d_drivedata[0]
+
+#ifndef LOCORE
+/*
+* Structure used to perform a format
+* or other raw operation, returning data
+* and/or register values.
+* Register identification and format
+* are device- and driver-dependent.
+*/
+struct format_op {
+	char	*df_buf;
+	int	df_count;	/* value-result */
+	daddr_t	df_startblk;
+	int	df_reg[8];	/* result */
+};
+
+/*
+* Structure used internally to retrieve
+* information about a partition on a disk.
+*/
+struct partinfo {
+	struct	disklabel *disklab;
+	struct	partition *part;
+};
+
+/*
+* Disk-specific ioctls.
+*/
+	/* get and set disklabel; DIOCGPART used internally */
+#define DIOCGDINFO   _IOR('d', 101, struct disklabel) /* get */
+#define DIOCSDINFO   _IOW('d', 102, struct disklabel) /* set */
+#define DIOCWDINFO   _IOW('d', 103, struct disklabel) /* set, update disk */
+#define DIOCGPART    _IOW('d', 104, struct partinfo)  /* get partition */
+
+/* do format operation, read or write */
+#define DIOCRFORMAT	_IOWR('d', 105, struct format_op)
+#define DIOCWFORMAT	_IOWR('d', 106, struct format_op)
+
+#define DIOCSSTEP	_IOW('d', 107, int) /* set step rate */
+#define DIOCSRETRIES	_IOW('d', 108, int) /* set # of retries */
+#define DIOCWLABEL	_IOW('d', 109, int) /* write en/disable label */
+
+#define DIOCSBAD	_IOW('d', 110, struct dkbad) /* set kernel dkbad */
+
+#endif LOCORE
+.Ed
+.Sh SEE ALSO
+.Xr disktab 5 ,
+.Xr disklabel 8
+.Sh HISTORY
diff --git a/sbin/clri/Makefile b/sbin/clri/Makefile
index deb3cbb17266..2447d7a331ec 100644
--- a/sbin/clri/Makefile
+++ b/sbin/clri/Makefile
@@ -1,6 +1,6 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
 
 PROG=	clri
-MAN8=	clri.0
+MAN8=	clri.8
 
 .include <bsd.prog.mk>
diff --git a/sbin/disklabel/Makefile b/sbin/disklabel/Makefile
index 177e3e4a9559..bf77cff4c2cf 100644
--- a/sbin/disklabel/Makefile
+++ b/sbin/disklabel/Makefile
@@ -2,6 +2,7 @@
 
 PROG=	disklabel
 SRCS=	disklabel.c dkcksum.c
-MAN8=	disklabel.0
+MAN8=	disklabel.8
+MAN5=	disklabel.5
 
 .include <bsd.prog.mk>
diff --git a/sbin/disklabel/disklabel.5 b/sbin/disklabel/disklabel.5
new file mode 100644
index 000000000000..fb6f6cd14d58
--- /dev/null
+++ b/sbin/disklabel/disklabel.5
@@ -0,0 +1,384 @@
+.\" Copyright (c) 1987, 1991, 1993
+.\"	The Regents of the University of California.  All rights reserved.
+.\"
+.\" This code is derived from software contributed to Berkeley by
+.\" Symmetric Computer Systems.
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\" 1. Redistributions of source code must retain the above copyright
+.\"    notice, this list of conditions and the following disclaimer.
+.\" 2. Redistributions in binary form must reproduce the above copyright
+.\"    notice, this list of conditions and the following disclaimer in the
+.\"    documentation and/or other materials provided with the distribution.
+.\" 3. All advertising materials mentioning features or use of this software
+.\"    must display the following acknowledgement:
+.\"	This product includes software developed by the University of
+.\"	California, Berkeley and its contributors.
+.\" 4. Neither the name of the University nor the names of its contributors
+.\"    may be used to endorse or promote products derived from this software
+.\"    without specific prior written permission.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
+.\"
+.\"     @(#)disklabel.5.5	8.1 (Berkeley) 6/5/93
+.\"
+.Dd June 5, 1993
+.Dt DISKLABEL 5
+.Os
+.Sh NAME
+.Nm disklabel
+.Nd disk pack label
+.Sh SYNOPSIS
+.Fd #include <sys/disklabel.h>
+.Sh DESCRIPTION
+Each disk or disk pack on a system may contain a disk label
+which provides detailed information
+about the geometry of the disk and the partitions into which the disk
+is divided.
+It should be initialized when the disk is formatted,
+and may be changed later with the
+.Xr disklabel 8
+program.
+This information is used by the system disk driver and by the bootstrap
+program to determine how to program the drive
+and where to find the filesystems on the disk partitions.
+Additional information is used by the filesystem in order
+to use the disk most efficiently and to locate important filesystem information.
+The description of each partition contains an identifier for the partition
+type (standard filesystem, swap area, etc.).
+The filesystem updates the in-core copy of the label if it contains
+incomplete information about the filesystem.
+.Pp
+The label is located in sector number
+.Dv LABELSECTOR
+of the drive, usually sector 0 where it may be found
+without any information about the disk geometry.
+It is at an offset
+.Dv LABELOFFSET
+from the beginning of the sector, to allow room for the initial bootstrap.
+The disk sector containing the label is normally made read-only
+so that it is not accidentally overwritten by pack-to-pack copies
+or swap operations;
+the
+.Dv DIOCWLABEL
+.Xr ioctl 2 ,
+which is done as needed by the
+.Xr disklabel
+program.
+.Pp
+A copy of the in-core label for a disk can be obtained with the
+.Dv DIOCGDINFO
+.Xr ioctl ;
+this works with a file descriptor for a block or character (``raw'') device
+for any partition of the disk.
+The in-core copy of the label is set by the 
+.Dv DIOCSDINFO
+.Xr ioctl .
+The offset of a partition cannot generally be changed while it is open,
+nor can it be made smaller while it is open.
+One exception is that any change is allowed if no label was found
+on the disk, and the driver was able to construct only a skeletal label
+without partition information.
+Finally, the 
+.Dv DIOCWDINFO
+.Xr ioctl
+operation sets the in-core label and then updates the on-disk label;
+there must be an existing label on the disk for this operation to succeed.
+Thus, the initial label for a disk or disk pack must be installed
+by writing to the raw disk.
+All of these operations are normally done using
+.Xr disklabel .
+.Pp
+The format of the disk label, as specified in
+.Aw Pa sys/disklabel.h ,
+is
+.Bd -literal
+/*
+* Disk description table, see disktab(5)
+*/
+#define	DISKTAB		"/etc/disktab"
+
+/*
+* Each disk has a label which includes information about the hardware
+* disk geometry, filesystem partitions, and drive specific information.
+* The label is in block 0 or 1, possibly offset from the beginning
+* to leave room for a bootstrap, etc.
+*/
+
+#ifndef	LABELSECTOR
+#define LABELSECTOR	0			/* sector containing label */
+#endif
+
+#ifndef	LABELOFFSET
+#define LABELOFFSET	64			/* offset of label in sector */
+#endif
+
+#define DISKMAGIC	((u_long) 0x82564557)	/* The disk magic number */
+#ifndef MAXPARTITIONS
+#define	MAXPARTITIONS	8
+#endif
+
+#ifndef LOCORE
+struct disklabel {
+	u_long	d_magic;	/* the magic number */
+	short	d_type;		/* drive type */
+	short	d_subtype;	/* controller/d_type specific */
+	char	d_typename[16];	/* type name, e.g. "eagle" */
+	/* 
+	* d_packname contains the pack identifier and is returned when
+	* the disklabel is read off the disk or in-core copy.
+	* d_boot0 and d_boot1 are the (optional) names of the
+	* primary (block 0) and secondary (block 1-15) bootstraps
+	* as found in /usr/mdec.  These are returned when using
+	* getdiskbyname(3)
+	to retrieve the values from /etc/disktab.
+	*/
+#if defined(KERNEL) || defined(STANDALONE)
+	char	d_packname[16];		/* pack identifier */ 
+#else
+	union {
+		char	un_d_packname[16];	/* pack identifier */ 
+		struct {
+			char *un_d_boot0;	/* primary bootstrap name */
+			char *un_d_boot1;	/* secondary bootstrap name */
+		} un_b; 
+	} d_un; 
+
+#define d_packname	d_un.un_d_packname
+#define d_boot0		d_un.un_b.un_d_boot0
+#define d_boot1		d_un.un_b.un_d_boot1
+#endif	/* ! KERNEL or STANDALONE */
+
+	/* disk geometry: */
+	u_long	d_secsize;	/* # of bytes per sector */
+	u_long	d_nsectors;	/* # of data sectors per track */
+	u_long	d_ntracks;	/* # of tracks per cylinder */
+	u_long	d_ncylinders;	/* # of data cylinders per unit */
+	u_long	d_secpercyl;	/* # of data sectors per cylinder */
+	u_long	d_secperunit;	/* # of data sectors per unit */
+	/*
+	* Spares (bad sector replacements) below
+	* are not counted in d_nsectors or d_secpercyl.
+	* Spare sectors are assumed to be physical sectors
+	* which occupy space at the end of each track and/or cylinder.
+	*/
+	u_short	d_sparespertrack;	/* # of spare sectors per track */
+	u_short	d_sparespercyl;	/* # of spare sectors per cylinder */
+	/*
+	* Alternate cylinders include maintenance, replacement,
+	* configuration description areas, etc.
+	*/
+	u_long	d_acylinders;	/* # of alt. cylinders per unit */
+
+		/* hardware characteristics: */
+	/*
+	* d_interleave, d_trackskew and d_cylskew describe perturbations
+	* in the media format used to compensate for a slow controller.
+	* Interleave is physical sector interleave, set up by the formatter
+	* or controller when formatting.  When interleaving is in use,
+	* logically adjacent sectors are not physically contiguous,
+	* but instead are separated by some number of sectors.
+	* It is specified as the ratio of physical sectors traversed
+	* per logical sector.  Thus an interleave of 1:1 implies contiguous
+	* layout, while 2:1 implies that logical sector 0 is separated
+	* by one sector from logical sector 1.
+	* d_trackskew is the offset of sector 0 on track N
+	* relative to sector 0 on track N-1 on the same cylinder.
+	* Finally, d_cylskew is the offset of sector 0 on cylinder N
+	* relative to sector 0 on cylinder N-1.
+	*/
+	u_short	d_rpm;	/* rotational speed */
+	u_short	d_interleave;	/* hardware sector interleave */
+	u_short	d_trackskew;	/* sector 0 skew, per track */
+	u_short	d_cylskew;	/* sector 0 skew, per cylinder */
+	u_long	d_headswitch;	/* head switch time, usec */
+	u_long	d_trkseek;	/* track-to-track seek, usec */
+	u_long	d_flags;	/* generic flags */
+#define NDDATA 5
+	u_long	d_drivedata[NDDATA];	/* drive-type specific information */
+#define NSPARE 5
+	u_long	d_spare[NSPARE];	/* reserved for future use */
+	u_long	d_magic2;	/* the magic number (again) */
+	u_short	d_checksum;	/* xor of data incl. partitions */
+
+	/* filesystem and partition information: */
+	u_short	d_npartitions;	/* number of partitions in following */
+	u_long	d_bbsize;	/* size of boot area at sn0, bytes */
+	u_long	d_sbsize;	/* max size of fs superblock, bytes */
+	struct	partition {	/* the partition table */
+		u_long	p_size;	/* number of sectors in partition */
+		u_long	p_offset;	/* starting sector */
+		u_long	p_fsize;	/* filesystem basic fragment size */
+		u_char	p_fstype;	/* filesystem type, see below */
+		u_char	p_frag;	/* filesystem fragments per block */
+		union {
+			u_short	cpg;	/* UFS: FS cylinders per group */
+			u_short	sgs;	/* LFS: FS segment shift */
+		} __partition_u1;
+#define	p_cpg	__partition_u1.cpg
+#define	p_sgs	__partition_u1.sgs
+		u_short	p_cpg;	/* filesystem cylinders per group */
+	} d_partitions[MAXPARTITIONS];	/* actually may be more */
+};
+
+/* d_type values: */
+#define	DTYPE_SMD	1	/* SMD, XSMD; VAX hp/up */
+#define	DTYPE_MSCP	2	/* MSCP */
+#define	DTYPE_DEC	3	/* other DEC (rk, rl) */
+#define	DTYPE_SCSI	4	/* SCSI */
+#define	DTYPE_ESDI	5	/* ESDI interface */
+#define	DTYPE_ST506	6	/* ST506 etc. */
+#define	DTYPE_HPIB	7	/* CS/80 on HP-IB */
+#define	DTYPE_HPFL	8	/* HP Fiber-link */
+#define	DTYPE_FLOPPY	10	/* floppy */
+
+#ifdef DKTYPENAMES
+static char *dktypenames[] = {
+	"unknown",
+	"SMD",
+	"MSCP",
+	"old DEC",
+	"SCSI",
+	"ESDI",
+	"ST506",
+	"HP-IB",
+	"HP-FL",
+	"type 9",
+	"floppy",
+	0
+};
+#define DKMAXTYPES	(sizeof(dktypenames) / sizeof(dktypenames[0]) - 1)
+#endif
+
+/*
+* Filesystem type and version.
+* Used to interpret other filesystem-specific
+* per-partition information.
+*/
+#define	FS_UNUSED	0	/* unused */
+#define	FS_SWAP		1	/* swap */
+#define	FS_V6		2	/* Sixth Edition */
+#define	FS_V7		3	/* Seventh Edition */
+#define	FS_SYSV		4	/* System V */
+#define	FS_V71K		5	/* V7 with 1K blocks (4.1, 2.9) */
+#define	FS_V8		6	/* Eighth Edition, 4K blocks */
+#define	FS_BSDFFS	7	/* 4.2BSD fast file system */
+#define	FS_MSDOS	8	/* MSDOS file system */
+#define	FS_BSDLFS	9	/* 4.4BSD log-structured file system */
+#define	FS_OTHER	10	/* in use, but unknown/unsupported */
+#define	FS_HPFS		11	/* OS/2 high-performance file system */
+#define	FS_ISO9660	12	/* ISO 9660, normally CD-ROM */
+#define	FS_BOOT		13	/* partition contains bootstrap */
+
+#ifdef	DKTYPENAMES
+static char *fstypenames[] = {
+	"unused",
+	"swap",
+	"Version 6",
+	"Version 7",
+	"System V",
+	"4.1BSD",
+	"Eighth Edition",
+	"4.2BSD",
+	"MSDOS",
+	"4.4LFS",
+	"unknown",
+	"HPFS",
+	"ISO9660",
+	"boot",
+	0
+};
+#define FSMAXTYPES	(sizeof(fstypenames) / sizeof(fstypenames[0]) - 1)
+#endif
+
+/*
+* flags shared by various drives:
+*/
+#define	D_REMOVABLE	0x01	/* removable media */
+#define	D_ECC		0x02	/* supports ECC */
+#define	D_BADSECT	0x04	/* supports bad sector forw. */
+#define	D_RAMDISK	0x08	/* disk emulator */
+#define	D_CHAIN		0x10	/* can do back-back transfers */
+
+/*
+* Drive data for SMD.
+*/
+
+#define	d_smdflags	d_drivedata[0]
+#define	D_SSE		0x1	/* supports skip sectoring */
+#define	d_mindist	d_drivedata[1]
+#define	d_maxdist	d_drivedata[2]
+#define	d_sdist		d_drivedata[3]
+
+/*
+* Drive data for ST506.
+*/
+#define d_precompcyl	d_drivedata[0]
+#define d_gap3		d_drivedata[1]	/* used only when formatting */
+
+/*
+ * Drive data for SCSI.
+ */
+#define	d_blind		d_drivedata[0]
+
+#ifndef LOCORE
+/*
+* Structure used to perform a format
+* or other raw operation, returning data
+* and/or register values.
+* Register identification and format
+* are device- and driver-dependent.
+*/
+struct format_op {
+	char	*df_buf;
+	int	df_count;	/* value-result */
+	daddr_t	df_startblk;
+	int	df_reg[8];	/* result */
+};
+
+/*
+* Structure used internally to retrieve
+* information about a partition on a disk.
+*/
+struct partinfo {
+	struct	disklabel *disklab;
+	struct	partition *part;
+};
+
+/*
+* Disk-specific ioctls.
+*/
+	/* get and set disklabel; DIOCGPART used internally */
+#define DIOCGDINFO   _IOR('d', 101, struct disklabel) /* get */
+#define DIOCSDINFO   _IOW('d', 102, struct disklabel) /* set */
+#define DIOCWDINFO   _IOW('d', 103, struct disklabel) /* set, update disk */
+#define DIOCGPART    _IOW('d', 104, struct partinfo)  /* get partition */
+
+/* do format operation, read or write */
+#define DIOCRFORMAT	_IOWR('d', 105, struct format_op)
+#define DIOCWFORMAT	_IOWR('d', 106, struct format_op)
+
+#define DIOCSSTEP	_IOW('d', 107, int) /* set step rate */
+#define DIOCSRETRIES	_IOW('d', 108, int) /* set # of retries */
+#define DIOCWLABEL	_IOW('d', 109, int) /* write en/disable label */
+
+#define DIOCSBAD	_IOW('d', 110, struct dkbad) /* set kernel dkbad */
+
+#endif LOCORE
+.Ed
+.Sh SEE ALSO
+.Xr disktab 5 ,
+.Xr disklabel 8
+.Sh HISTORY
diff --git a/sbin/dmesg/Makefile b/sbin/dmesg/Makefile
index fc5edce2ae16..83a194ce0182 100644
--- a/sbin/dmesg/Makefile
+++ b/sbin/dmesg/Makefile
@@ -1,7 +1,7 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
 
 PROG=	dmesg
-MAN8=	dmesg.0
+MAN8=	dmesg.8
 BINGRP=	kmem
 BINMODE=2555
 LDADD=	-lkvm
diff --git a/sbin/dump/Makefile b/sbin/dump/Makefile
index 78ab5d8be25d..d9aba3d67e95 100644
--- a/sbin/dump/Makefile
+++ b/sbin/dump/Makefile
@@ -19,7 +19,7 @@ SRCS=	itime.c main.c optr.c dumprmt.c tape.c traverse.c unctime.c
 BINOWN=	root
 BINGRP=	tty
 BINMODE=6555
-MAN8=	dump.0
+MAN8=	dump.8
 MLINKS+=dump.8 rdump.8
 
 .include <bsd.prog.mk>
diff --git a/sbin/dumpfs/Makefile b/sbin/dumpfs/Makefile
index dd2a0c2830ca..851a73388ca8 100644
--- a/sbin/dumpfs/Makefile
+++ b/sbin/dumpfs/Makefile
@@ -1,6 +1,6 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
 
 PROG=	dumpfs
-MAN8=	dumpfs.0
+MAN8=	dumpfs.8
 
 .include <bsd.prog.mk>
diff --git a/sbin/dumplfs/Makefile b/sbin/dumplfs/Makefile
index 25574924d0a7..93f2707a704a 100644
--- a/sbin/dumplfs/Makefile
+++ b/sbin/dumplfs/Makefile
@@ -4,6 +4,6 @@ PROG=	dumplfs
 CFLAGS+=-I/sys/ufs/lfs
 SRCS=	dumplfs.c lfs_cksum.c misc.c
 .PATH:	/sys/ufs/lfs
-MAN8=	dumplfs.0
+MAN8=	dumplfs.8
 
 .include <bsd.prog.mk>
diff --git a/sbin/fastboot/Makefile b/sbin/fastboot/Makefile
index 9504f792b9e0..1bd7949a022e 100644
--- a/sbin/fastboot/Makefile
+++ b/sbin/fastboot/Makefile
@@ -1,6 +1,6 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
 
-MAN8=	fastboot.0
+MAN8=	fastboot.8
 MLINKS=	fastboot.8 fasthalt.8
 
 beforeinstall:
diff --git a/sbin/fastboot/fastboot.sh b/sbin/fastboot/fastboot.sh
index 852ec4a1b089..6d36f4eca74c 100644
--- a/sbin/fastboot/fastboot.sh
+++ b/sbin/fastboot/fastboot.sh
@@ -35,4 +35,4 @@
 #
 
 cp /dev/null /fastboot
-/sbin/reboot $*
+exec /sbin/reboot $*
diff --git a/sbin/fastboot/fasthalt.sh b/sbin/fastboot/fasthalt.sh
index c8e381f3e51e..fce66e16a6a6 100644
--- a/sbin/fastboot/fasthalt.sh
+++ b/sbin/fastboot/fasthalt.sh
@@ -35,4 +35,4 @@
 #
 
 cp /dev/null /fastboot
-/sbin/halt $*
+exec /sbin/halt $*
diff --git a/sbin/fsck/Makefile b/sbin/fsck/Makefile
index 224f6b2200e7..e31e9928824f 100644
--- a/sbin/fsck/Makefile
+++ b/sbin/fsck/Makefile
@@ -1,7 +1,7 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
 
 PROG=	fsck
-MAN8=	fsck.0
+MAN8=	fsck.8
 SRCS=	dir.c inode.c main.c pass1.c pass1b.c pass2.c pass3.c pass4.c \
 	pass5.c preen.c setup.c utilities.c ffs_subr.c ffs_tables.c
 .PATH:	${.CURDIR}/../../sys/ufs/ffs
diff --git a/sbin/fsck_ffs/Makefile b/sbin/fsck_ffs/Makefile
index 224f6b2200e7..e31e9928824f 100644
--- a/sbin/fsck_ffs/Makefile
+++ b/sbin/fsck_ffs/Makefile
@@ -1,7 +1,7 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
 
 PROG=	fsck
-MAN8=	fsck.0
+MAN8=	fsck.8
 SRCS=	dir.c inode.c main.c pass1.c pass1b.c pass2.c pass3.c pass4.c \
 	pass5.c preen.c setup.c utilities.c ffs_subr.c ffs_tables.c
 .PATH:	${.CURDIR}/../../sys/ufs/ffs
diff --git a/sbin/fsck_ifs/Makefile b/sbin/fsck_ifs/Makefile
index 224f6b2200e7..e31e9928824f 100644
--- a/sbin/fsck_ifs/Makefile
+++ b/sbin/fsck_ifs/Makefile
@@ -1,7 +1,7 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
 
 PROG=	fsck
-MAN8=	fsck.0
+MAN8=	fsck.8
 SRCS=	dir.c inode.c main.c pass1.c pass1b.c pass2.c pass3.c pass4.c \
 	pass5.c preen.c setup.c utilities.c ffs_subr.c ffs_tables.c
 .PATH:	${.CURDIR}/../../sys/ufs/ffs
diff --git a/sbin/ifconfig/Makefile b/sbin/ifconfig/Makefile
index 8be219395873..7bba665d134b 100644
--- a/sbin/ifconfig/Makefile
+++ b/sbin/ifconfig/Makefile
@@ -1,6 +1,6 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
 
 PROG=	ifconfig
-MAN8=	ifconfig.0
+MAN8=	ifconfig.8
 
 .include <bsd.prog.mk>
diff --git a/sbin/init/Makefile b/sbin/init/Makefile
index 1a796a1069f7..ff6ce1ee45dd 100644
--- a/sbin/init/Makefile
+++ b/sbin/init/Makefile
@@ -1,7 +1,7 @@
 #	@(#)Makefile	8.1 (Berkeley) 7/19/93
 
 PROG=	init
-MAN8=	init.0
+MAN8=	init.8
 DPADD=	${LIBUTIL}
 LDADD=	-lutil
 BINMODE=500
diff --git a/sbin/mknod/Makefile b/sbin/mknod/Makefile
index 272753faacea..f19c4f7d7f68 100644
--- a/sbin/mknod/Makefile
+++ b/sbin/mknod/Makefile
@@ -1,6 +1,6 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
 
 PROG=	mknod
-MAN8=	mknod.0
+MAN8=	mknod.8
 
 .include <bsd.prog.mk>
diff --git a/sbin/mount/Makefile b/sbin/mount/Makefile
index b3efd4ef63c4..6d87935d5f2c 100644
--- a/sbin/mount/Makefile
+++ b/sbin/mount/Makefile
@@ -2,7 +2,7 @@
 
 PROG=	mount
 SRCS=	mount.c mount_ufs.c getmntopts.c
-MAN8=	mount.0
+MAN8=	mount.8
 # We do NOT install the getmntopts.3 man page.
 
 .include <bsd.prog.mk>
diff --git a/sbin/mount_cd9660/Makefile b/sbin/mount_cd9660/Makefile
index 2491dff65559..fc192a51720f 100644
--- a/sbin/mount_cd9660/Makefile
+++ b/sbin/mount_cd9660/Makefile
@@ -2,7 +2,7 @@
 
 PROG=	mount_cd9660
 SRCS=	mount_cd9660.c getmntopts.c
-MAN8=	mount_cd9660.0
+MAN8=	mount_cd9660.8
 
 MOUNT=	${.CURDIR}/../mount
 CFLAGS+= -I${MOUNT}
diff --git a/sbin/mount_fdesc/Makefile b/sbin/mount_fdesc/Makefile
index 2f8f3cd7df10..5dbdb4de0a68 100644
--- a/sbin/mount_fdesc/Makefile
+++ b/sbin/mount_fdesc/Makefile
@@ -2,7 +2,7 @@
 
 PROG=	mount_fdesc
 SRCS=	mount_fdesc.c getmntopts.c
-MAN8=	mount_fdesc.0
+MAN8=	mount_fdesc.8
 
 MOUNT=	${.CURDIR}/../mount
 CFLAGS+= -I${MOUNT}
diff --git a/sbin/mount_ifs/Makefile b/sbin/mount_ifs/Makefile
index b3efd4ef63c4..6d87935d5f2c 100644
--- a/sbin/mount_ifs/Makefile
+++ b/sbin/mount_ifs/Makefile
@@ -2,7 +2,7 @@
 
 PROG=	mount
 SRCS=	mount.c mount_ufs.c getmntopts.c
-MAN8=	mount.0
+MAN8=	mount.8
 # We do NOT install the getmntopts.3 man page.
 
 .include <bsd.prog.mk>
diff --git a/sbin/mount_kernfs/Makefile b/sbin/mount_kernfs/Makefile
index 6bd6d7c65e61..004d91d0de5f 100644
--- a/sbin/mount_kernfs/Makefile
+++ b/sbin/mount_kernfs/Makefile
@@ -2,7 +2,7 @@
 
 PROG=	mount_kernfs
 SRCS=	mount_kernfs.c getmntopts.c
-MAN8=	mount_kernfs.0
+MAN8=	mount_kernfs.8
 
 MOUNT=	${.CURDIR}/../mount
 CFLAGS+= -I${MOUNT}
diff --git a/sbin/mount_lfs/Makefile b/sbin/mount_lfs/Makefile
index d3fb12bae49d..0020b8bfebad 100644
--- a/sbin/mount_lfs/Makefile
+++ b/sbin/mount_lfs/Makefile
@@ -2,7 +2,7 @@
 
 PROG=	mount_lfs
 SRCS=	mount_lfs.c getmntopts.c
-MAN8=	mount_lfs.0
+MAN8=	mount_lfs.8
 
 MOUNT=	${.CURDIR}/../mount
 CFLAGS+= -I${MOUNT}
diff --git a/sbin/mount_nfs/Makefile b/sbin/mount_nfs/Makefile
index f33b461560cf..a3602740c06e 100644
--- a/sbin/mount_nfs/Makefile
+++ b/sbin/mount_nfs/Makefile
@@ -2,7 +2,7 @@
 
 PROG=	mount_nfs
 SRCS=	mount_nfs.c getmntopts.c
-MAN8=	mount_nfs.0
+MAN8=	mount_nfs.8
 
 MOUNT=	${.CURDIR}/../mount
 CFLAGS+= -DNFS -I${MOUNT}
diff --git a/sbin/mount_null/Makefile b/sbin/mount_null/Makefile
index aae87e11b2db..f20f91b6b6f4 100644
--- a/sbin/mount_null/Makefile
+++ b/sbin/mount_null/Makefile
@@ -2,7 +2,7 @@
 
 PROG=	mount_null
 SRCS=	mount_null.c getmntopts.c
-MAN8=	mount_null.0
+MAN8=	mount_null.8
 
 MOUNT=	${.CURDIR}/../mount
 CFLAGS+= -I/sys -I${MOUNT}
diff --git a/sbin/mount_nullfs/Makefile b/sbin/mount_nullfs/Makefile
index aae87e11b2db..f20f91b6b6f4 100644
--- a/sbin/mount_nullfs/Makefile
+++ b/sbin/mount_nullfs/Makefile
@@ -2,7 +2,7 @@
 
 PROG=	mount_null
 SRCS=	mount_null.c getmntopts.c
-MAN8=	mount_null.0
+MAN8=	mount_null.8
 
 MOUNT=	${.CURDIR}/../mount
 CFLAGS+= -I/sys -I${MOUNT}
diff --git a/sbin/mount_portal/Makefile b/sbin/mount_portal/Makefile
index 1f17d245ed20..4f32edaa3117 100644
--- a/sbin/mount_portal/Makefile
+++ b/sbin/mount_portal/Makefile
@@ -3,7 +3,7 @@
 PROG=	mount_portal
 SRCS=	mount_portal.c activate.c conf.c getmntopts.c pt_conf.c \
 	pt_exec.c pt_file.c pt_tcp.c
-MAN8=	mount_portal.0
+MAN8=	mount_portal.8
 
 MOUNT=	${.CURDIR}/../mount
 CFLAGS+= -I/sys -I${MOUNT}
diff --git a/sbin/mount_portalfs/Makefile b/sbin/mount_portalfs/Makefile
index 1f17d245ed20..4f32edaa3117 100644
--- a/sbin/mount_portalfs/Makefile
+++ b/sbin/mount_portalfs/Makefile
@@ -3,7 +3,7 @@
 PROG=	mount_portal
 SRCS=	mount_portal.c activate.c conf.c getmntopts.c pt_conf.c \
 	pt_exec.c pt_file.c pt_tcp.c
-MAN8=	mount_portal.0
+MAN8=	mount_portal.8
 
 MOUNT=	${.CURDIR}/../mount
 CFLAGS+= -I/sys -I${MOUNT}
diff --git a/sbin/mount_procfs/Makefile b/sbin/mount_procfs/Makefile
index ca0c872520b0..187bddd435f2 100644
--- a/sbin/mount_procfs/Makefile
+++ b/sbin/mount_procfs/Makefile
@@ -2,7 +2,7 @@
 
 PROG=	mount_procfs
 SRCS=	mount_procfs.c getmntopts.c
-MAN8=	mount_procfs.0
+MAN8=	mount_procfs.8
 
 MOUNT=	${.CURDIR}/../mount
 CFLAGS+= -I${MOUNT}
diff --git a/sbin/mount_umap/Makefile b/sbin/mount_umap/Makefile
index af1bf2f0457d..49157cd53513 100644
--- a/sbin/mount_umap/Makefile
+++ b/sbin/mount_umap/Makefile
@@ -2,7 +2,7 @@
 
 PROG=	mount_umap
 SRCS=	mount_umap.c getmntopts.c
-MAN8=	mount_umap.0
+MAN8=	mount_umap.8
 
 MOUNT=	${.CURDIR}/../mount
 CFLAGS+= -I/sys -I${MOUNT}
diff --git a/sbin/mount_umapfs/Makefile b/sbin/mount_umapfs/Makefile
index af1bf2f0457d..49157cd53513 100644
--- a/sbin/mount_umapfs/Makefile
+++ b/sbin/mount_umapfs/Makefile
@@ -2,7 +2,7 @@
 
 PROG=	mount_umap
 SRCS=	mount_umap.c getmntopts.c
-MAN8=	mount_umap.0
+MAN8=	mount_umap.8
 
 MOUNT=	${.CURDIR}/../mount
 CFLAGS+= -I/sys -I${MOUNT}
diff --git a/sbin/mount_union/Makefile b/sbin/mount_union/Makefile
index a6b33af5ebf8..70d74d6b427c 100644
--- a/sbin/mount_union/Makefile
+++ b/sbin/mount_union/Makefile
@@ -2,7 +2,7 @@
 
 PROG=	mount_union
 SRCS=	mount_union.c getmntopts.c
-MAN8=	mount_union.0
+MAN8=	mount_union.8
 
 MOUNT=	${.CURDIR}/../mount
 CFLAGS+= -I/sys -I${MOUNT}
diff --git a/sbin/mount_unionfs/Makefile b/sbin/mount_unionfs/Makefile
index a6b33af5ebf8..70d74d6b427c 100644
--- a/sbin/mount_unionfs/Makefile
+++ b/sbin/mount_unionfs/Makefile
@@ -2,7 +2,7 @@
 
 PROG=	mount_union
 SRCS=	mount_union.c getmntopts.c
-MAN8=	mount_union.0
+MAN8=	mount_union.8
 
 MOUNT=	${.CURDIR}/../mount
 CFLAGS+= -I/sys -I${MOUNT}
diff --git a/sbin/mountd/Makefile b/sbin/mountd/Makefile
index 36e2a0572406..d8efea126fc8 100644
--- a/sbin/mountd/Makefile
+++ b/sbin/mountd/Makefile
@@ -2,8 +2,8 @@
 
 PROG=	mountd
 CFLAGS+=-DNFS -DMFS -DCD9660
-MAN5=	exports.0 netgroup.0
-MAN8=	mountd.0
+MAN5=	exports.5 netgroup.5
+MAN8=	mountd.8
 DPADD=	${LIBRPC}
 LDADD=	-lrpc
 
diff --git a/sbin/newfs/Makefile b/sbin/newfs/Makefile
index 23942725acf7..69f04d040811 100644
--- a/sbin/newfs/Makefile
+++ b/sbin/newfs/Makefile
@@ -2,7 +2,7 @@
 
 PROG=	newfs
 SRCS=	dkcksum.c getmntopts.c newfs.c mkfs.c
-MAN8=	newfs.0
+MAN8=	newfs.8
 
 MOUNT=	${.CURDIR}/../mount
 CFLAGS+=-DMFS -I${MOUNT}
diff --git a/sbin/newlfs/Makefile b/sbin/newlfs/Makefile
index c79c83e2116c..089029e01b73 100644
--- a/sbin/newlfs/Makefile
+++ b/sbin/newlfs/Makefile
@@ -3,7 +3,7 @@
 PROG=	newlfs
 CFLAGS+=-I/sys/ufs/lfs
 SRCS=	dkcksum.c lfs.c lfs_cksum.c misc.c newfs.c
-MAN8=	newlfs.0
+MAN8=	newlfs.8
 .PATH:	/sys/ufs/lfs ${.CURDIR}/../disklabel
 
 .include <bsd.prog.mk>
diff --git a/sbin/nfsd/Makefile b/sbin/nfsd/Makefile
index 35d0d0e21413..9eb641500410 100644
--- a/sbin/nfsd/Makefile
+++ b/sbin/nfsd/Makefile
@@ -2,7 +2,7 @@
 
 PROG=	nfsd
 CFLAGS+=-DNFS
-MAN8=	nfsd.0
+MAN8=	nfsd.8
 DPADD=	${LIBRPC}
 LDADD=	-lrpc
 
diff --git a/sbin/nfsiod/Makefile b/sbin/nfsiod/Makefile
index 72db42bac6b5..08d6157e436a 100644
--- a/sbin/nfsiod/Makefile
+++ b/sbin/nfsiod/Makefile
@@ -2,6 +2,6 @@
 
 PROG=	nfsiod
 CFLAGS+=-DNFS
-MAN8=	nfsiod.0
+MAN8=	nfsiod.8
 
 .include <bsd.prog.mk>
diff --git a/sbin/nologin/Makefile b/sbin/nologin/Makefile
index 84e9f0c3b152..5d89fffe2d25 100644
--- a/sbin/nologin/Makefile
+++ b/sbin/nologin/Makefile
@@ -1,6 +1,6 @@
 #	@(#)Makefile	8.2 (Berkeley) 4/22/94
 
-MAN8=	nologin.0
+MAN8=	nologin.8
 
 nologin clean depend lint tags:
 
@@ -8,7 +8,4 @@ beforeinstall:
 	install -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
 	    ${.CURDIR}/nologin.sh ${DESTDIR}/sbin/nologin
 
-cleandir:
-	rm -f nologin.0
-
 .include <bsd.prog.mk>
diff --git a/sbin/ping/Makefile b/sbin/ping/Makefile
index d08f74dddbc8..a7ed7666b118 100644
--- a/sbin/ping/Makefile
+++ b/sbin/ping/Makefile
@@ -1,7 +1,7 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
 
 PROG=	ping
-MAN8=	ping.0
+MAN8=	ping.8
 BINOWN=	root
 BINMODE=4555
 
diff --git a/sbin/quotacheck/Makefile b/sbin/quotacheck/Makefile
index c6b8e3eee1ea..7f929c8a2d7a 100644
--- a/sbin/quotacheck/Makefile
+++ b/sbin/quotacheck/Makefile
@@ -2,7 +2,7 @@
 
 PROG=	quotacheck
 SRCS=	quotacheck.c preen.c
-MAN8=	quotacheck.0
+MAN8=	quotacheck.8
 .PATH:	${.CURDIR}/../fsck
 
 .include <bsd.prog.mk>
diff --git a/sbin/reboot/Makefile b/sbin/reboot/Makefile
index 71f0bdfb3f7e..7dd2e9040e62 100644
--- a/sbin/reboot/Makefile
+++ b/sbin/reboot/Makefile
@@ -3,16 +3,16 @@
 PROG=	reboot
 DPADD=	${LIBUTIL}
 LDADD=	-lutil
-MAN8=	reboot.0 boot_hp300.0 boot_i386.0 boot_sparc.0 boot_tahoe.0 boot_vax.0
+MAN8=	reboot.8 boot_hp300.8 boot_i386.8 boot_sparc.8 boot_tahoe.8 boot_vax.8
 MLINKS=	reboot.8 halt.8
 LINKS=	${BINDIR}/reboot ${BINDIR}/halt
 
 XXXBROKENafterinstall:
-	${MINSTALL} boot_hp300.0 ${DESTDIR}${MANDIR}8/hp300/boot.0
-	${MINSTALL} boot_i386.0 ${DESTDIR}${MANDIR}8/i386/boot.0
-	${MINSTALL} boot_sparc.0 ${DESTDIR}${MANDIR}8/sparc/boot.0
-	${MINSTALL} boot_tahoe.0 ${DESTDIR}${MANDIR}8/tahoe/boot.0
-	${MINSTALL} boot_vax.0 ${DESTDIR}${MANDIR}8/vax/boot.0
+	${MINSTALL} boot_hp300.8 ${DESTDIR}${MANDIR}8/hp300/boot.8
+	${MINSTALL} boot_i386.8 ${DESTDIR}${MANDIR}8/i386/boot.8
+	${MINSTALL} boot_sparc.8 ${DESTDIR}${MANDIR}8/sparc/boot.8
+	${MINSTALL} boot_tahoe.8 ${DESTDIR}${MANDIR}8/tahoe/boot.8
+	${MINSTALL} boot_vax.8 ${DESTDIR}${MANDIR}8/vax/boot.8
 
 .include <bsd.man.mk>
 .include <bsd.prog.mk>
diff --git a/sbin/restore/Makefile b/sbin/restore/Makefile
index 2573bdb575df..5d49d0041b5a 100644
--- a/sbin/restore/Makefile
+++ b/sbin/restore/Makefile
@@ -8,7 +8,7 @@ SRCS=	main.c interactive.c restore.c dirs.c symtab.c tape.c utilities.c \
 BINOWN=	root
 BINGRP=	tty
 BINMODE=6555
-MAN8=	restore.0
+MAN8=	restore.8
 MLINKS+=restore.8 rrestore.8
 .PATH:	${.CURDIR}/../dump
 
diff --git a/sbin/route/Makefile b/sbin/route/Makefile
index a04fe456eadb..1d0d0301e491 100644
--- a/sbin/route/Makefile
+++ b/sbin/route/Makefile
@@ -1,7 +1,7 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
 
 PROG=	route
-MAN8=	route.0
+MAN8=	route.8
 SRCS=	route.c ccitt_addr.c
 CFLAGS+=-I.
 CLEANFILES+=keywords.h
@@ -18,6 +18,8 @@ keywords.h: keywords
 	    > ${.TARGET}
 	rm -f _keywords.tmp
 
+./keywords.h:	keywords.h
+
 .include <bsd.prog.mk>
 
 route .depend lint tags: keywords.h
diff --git a/sbin/savecore/Makefile b/sbin/savecore/Makefile
index 965c52c6b4be..71a17f229f93 100644
--- a/sbin/savecore/Makefile
+++ b/sbin/savecore/Makefile
@@ -2,7 +2,7 @@
 
 PROG=	savecore
 SRCS=	savecore.c zopen.c
-MAN8=	savecore.0
+MAN8=	savecore.8
 .PATH:	${.CURDIR}/../../usr.bin/compress
 
 .include <bsd.prog.mk>
diff --git a/sbin/shutdown/Makefile b/sbin/shutdown/Makefile
index 19122f21997c..48847e472234 100644
--- a/sbin/shutdown/Makefile
+++ b/sbin/shutdown/Makefile
@@ -1,7 +1,7 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
 
 PROG=	shutdown
-MAN8=	shutdown.0
+MAN8=	shutdown.8
 BINOWN=	root
 BINGRP=	operator
 BINMODE=4550
diff --git a/sbin/slattach/Makefile b/sbin/slattach/Makefile
index 0a1e759c430c..4951f7e4a324 100644
--- a/sbin/slattach/Makefile
+++ b/sbin/slattach/Makefile
@@ -1,7 +1,7 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
 
 PROG=	slattach
-MAN8=	slattach.0
+MAN8=	slattach.8
 MLINKS=	slattach.8 slip.8
 
 .include <bsd.prog.mk>
diff --git a/sbin/startslip/Makefile b/sbin/startslip/Makefile
index 14c72bc54fb8..339741738961 100644
--- a/sbin/startslip/Makefile
+++ b/sbin/startslip/Makefile
@@ -1,6 +1,6 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
 
 PROG=	startslip
-MAN8=	startslip.0
+MAN1=	startslip.1
 
 .include <bsd.prog.mk>
diff --git a/sbin/swapon/Makefile b/sbin/swapon/Makefile
index 23836a100271..ed5aebc8775f 100644
--- a/sbin/swapon/Makefile
+++ b/sbin/swapon/Makefile
@@ -1,6 +1,6 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
 
 PROG=	swapon
-MAN8=	swapon.0
+MAN8=	swapon.8
 
 .include <bsd.prog.mk>
diff --git a/sbin/tunefs/Makefile b/sbin/tunefs/Makefile
index 92f94d73ea1a..ec9e8c9898c9 100644
--- a/sbin/tunefs/Makefile
+++ b/sbin/tunefs/Makefile
@@ -1,6 +1,6 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
 
 PROG=	tunefs
-MAN8=	tunefs.0
+MAN8=	tunefs.8
 
 .include <bsd.prog.mk>
diff --git a/sbin/umount/Makefile b/sbin/umount/Makefile
index 9665a5923db0..29c0f9f7615b 100644
--- a/sbin/umount/Makefile
+++ b/sbin/umount/Makefile
@@ -3,5 +3,6 @@
 PROG=	umount
 DPADD=	${LIBRPC}
 LDADD=	-lrpc
+MAN8=	umount.8
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/mount_portalfs/Makefile b/usr.sbin/mount_portalfs/Makefile
index 1f17d245ed20..4f32edaa3117 100644
--- a/usr.sbin/mount_portalfs/Makefile
+++ b/usr.sbin/mount_portalfs/Makefile
@@ -3,7 +3,7 @@
 PROG=	mount_portal
 SRCS=	mount_portal.c activate.c conf.c getmntopts.c pt_conf.c \
 	pt_exec.c pt_file.c pt_tcp.c
-MAN8=	mount_portal.0
+MAN8=	mount_portal.8
 
 MOUNT=	${.CURDIR}/../mount
 CFLAGS+= -I/sys -I${MOUNT}
diff --git a/usr.sbin/mountd/Makefile b/usr.sbin/mountd/Makefile
index 36e2a0572406..d8efea126fc8 100644
--- a/usr.sbin/mountd/Makefile
+++ b/usr.sbin/mountd/Makefile
@@ -2,8 +2,8 @@
 
 PROG=	mountd
 CFLAGS+=-DNFS -DMFS -DCD9660
-MAN5=	exports.0 netgroup.0
-MAN8=	mountd.0
+MAN5=	exports.5 netgroup.5
+MAN8=	mountd.8
 DPADD=	${LIBRPC}
 LDADD=	-lrpc
 
diff --git a/usr.sbin/nfsd/Makefile b/usr.sbin/nfsd/Makefile
index 35d0d0e21413..9eb641500410 100644
--- a/usr.sbin/nfsd/Makefile
+++ b/usr.sbin/nfsd/Makefile
@@ -2,7 +2,7 @@
 
 PROG=	nfsd
 CFLAGS+=-DNFS
-MAN8=	nfsd.0
+MAN8=	nfsd.8
 DPADD=	${LIBRPC}
 LDADD=	-lrpc
 
diff --git a/usr.sbin/nologin/Makefile b/usr.sbin/nologin/Makefile
index 84e9f0c3b152..5d89fffe2d25 100644
--- a/usr.sbin/nologin/Makefile
+++ b/usr.sbin/nologin/Makefile
@@ -1,6 +1,6 @@
 #	@(#)Makefile	8.2 (Berkeley) 4/22/94
 
-MAN8=	nologin.0
+MAN8=	nologin.8
 
 nologin clean depend lint tags:
 
@@ -8,7 +8,4 @@ beforeinstall:
 	install -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
 	    ${.CURDIR}/nologin.sh ${DESTDIR}/sbin/nologin
 
-cleandir:
-	rm -f nologin.0
-
 .include <bsd.prog.mk>