diff --git a/share/man/man8/man8.acorn32/nbfs.8 b/share/man/man8/man8.acorn32/nbfs.8
index 026e0d47a5d8..20ce9d291c33 100644
--- a/share/man/man8/man8.acorn32/nbfs.8
+++ b/share/man/man8/man8.acorn32/nbfs.8
@@ -1,4 +1,4 @@
-.\" $NetBSD: nbfs.8,v 1.2 2010/11/25 09:13:37 wiz Exp $
+.\" $NetBSD: nbfs.8,v 1.3 2017/02/17 22:30:27 christos Exp $
 .\"
 .\" Copyright (c) 2006 Ben Harris
 .\" All rights reserved.
@@ -25,7 +25,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd July 3, 2006
+.Dd February 17, 2017
 .Dt NBFS 8 acorn32
 .Os
 .Sh NAME
@@ -73,7 +73,7 @@ on the partition mentioned above would be referred to as
 .Nm
 is very limited.
 .Sh SEE ALSO
-.Xr boot32 8
+.Xr acorn32/boot32 8
 .Rs
 .%Q Acorn Computers Ltd
 .%T RISC OS 3.7 User Guide
diff --git a/share/man/man8/man8.alpha/boot.8 b/share/man/man8/man8.alpha/boot.8
index 3807b8fd4222..5ca25936dc9a 100644
--- a/share/man/man8/man8.alpha/boot.8
+++ b/share/man/man8/man8.alpha/boot.8
@@ -1,4 +1,4 @@
-.\" $NetBSD: boot.8,v 1.13 2003/08/07 10:31:22 agc Exp $
+.\" $NetBSD: boot.8,v 1.14 2017/02/17 22:30:27 christos Exp $
 .\"
 .\" Copyright (c) 1999 Christopher G. Demetriou
 .\" All rights reserved.
@@ -66,7 +66,7 @@
 .\"
 .\"     @(#)boot_hp300.8        8.2 (Berkeley) 4/19/94
 .\"
-.Dd May 29, 2003
+.Dd February 17, 2017
 .Dt BOOT 8 alpha
 .Os
 .Sh NAME
@@ -515,11 +515,11 @@ disk and tape bootstrap
 .Xr diskless 8 ,
 .Xr init 8 ,
 .Xr installboot 8 ,
-.Xr mkbootimage 8 ,
+.Xr alpha/mkbootimage 8 ,
 .Xr rc 8 ,
 .Xr reboot 8 ,
 .Xr savecore 8 ,
-.Xr setnetbootinfo 8 ,
+.Xr alpha/setnetbootinfo 8 ,
 .Xr shutdown 8
 .Rs
 .%T "Alpha Architecture Reference Manual Third Edition"
diff --git a/share/man/man8/man8.alpha/mkbootimage.8 b/share/man/man8/man8.alpha/mkbootimage.8
index a59518af2b24..a3e23ca37390 100644
--- a/share/man/man8/man8.alpha/mkbootimage.8
+++ b/share/man/man8/man8.alpha/mkbootimage.8
@@ -1,4 +1,4 @@
-.\" $NetBSD: mkbootimage.8,v 1.7 2003/07/26 20:17:38 salo Exp $
+.\" $NetBSD: mkbootimage.8,v 1.8 2017/02/17 22:30:27 christos Exp $
 .\"
 .\" Copyright (c) 1999 Christopher G. Demetriou
 .\" All rights reserved.
@@ -32,7 +32,7 @@
 .\"
 .\" <<Id: LICENSE,v 1.2 2000/06/14 15:57:33 cgd Exp>>
 .\"
-.Dd April 3, 1999
+.Dd February 17, 2017
 .Dt MKBOOTIMAGE 8 alpha
 .Os
 .Sh NAME
@@ -118,7 +118,7 @@ concatenate it with a tar file containing a kernel,
 and write the output to a tape.  This is an example of
 how to create a tape which boots a kernel.
 .Sh SEE ALSO
-.Xr boot 8 ,
+.Xr alpha/boot 8 ,
 .Xr installboot 8
 .Sh HISTORY
 The
diff --git a/share/man/man8/man8.alpha/setnetbootinfo.8 b/share/man/man8/man8.alpha/setnetbootinfo.8
index cffe4f7957b5..d96dfe473711 100644
--- a/share/man/man8/man8.alpha/setnetbootinfo.8
+++ b/share/man/man8/man8.alpha/setnetbootinfo.8
@@ -1,4 +1,4 @@
-.\" $NetBSD: setnetbootinfo.8,v 1.11 2003/07/26 20:17:38 salo Exp $
+.\" $NetBSD: setnetbootinfo.8,v 1.12 2017/02/17 22:30:27 christos Exp $
 .\"
 .\" Copyright (c) 1997, 1999 Christopher G. Demetriou
 .\" All rights reserved.
@@ -32,7 +32,7 @@
 .\"
 .\" <<Id: LICENSE,v 1.2 2000/06/14 15:57:33 cgd Exp>>
 .\"
-.Dd April 3, 1999
+.Dd February 17, 2017
 .Dt SETNETBOOTINFO 8 alpha
 .Os
 .Sh NAME
@@ -137,8 +137,8 @@ network bootstrap program
 .\" .Nm setnetbootinfo .
 .\" XXX
 .Sh SEE ALSO
-.Xr boot 8 ,
-.Xr bootpd 8
+.Xr alpha/boot 8 ,
+.Xr alpha/bootpd 8
 .Sh HISTORY
 The
 .Nx Ns Tn /alpha
diff --git a/share/man/man8/man8.amiga/boot.8 b/share/man/man8/man8.amiga/boot.8
index 6bcddace6067..0d2eedda5805 100644
--- a/share/man/man8/man8.amiga/boot.8
+++ b/share/man/man8/man8.amiga/boot.8
@@ -1,4 +1,4 @@
-.\"	$NetBSD: boot.8,v 1.14 2016/01/15 09:05:16 wiz Exp $
+.\"	$NetBSD: boot.8,v 1.15 2017/02/17 22:30:27 christos Exp $
 .\"
 .\" Copyright (c) 1990, 1991 The Regents of the University of California.
 .\" All rights reserved.
@@ -34,7 +34,7 @@
 .\"	From:
 .\"	@(#)boot_hp300.8	8.2 (Berkeley) 4/19/94
 .\"
-.Dd January 15, 2016
+.Dd February 17, 2017
 .Dt BOOT 8 amiga
 .Os
 .Sh NAME
@@ -68,7 +68,7 @@ When a bootable
 .Nx
 partition is created by means of HDTOOLBOX or another RDB editing program
 and a bootblock has been copied there by
-.Xr installboot 8
+.Xr amiga/installboot 8
 and the boot priority of the
 .Nx
 partition is either the highest or the
@@ -248,7 +248,7 @@ secondary bootstrap (installed)
 .Sh SEE ALSO
 .Xr ddb 4 ,
 .Xr fsck_ffs 8 ,
-.Xr installboot 8 ,
+.Xr amiga/installboot 8 ,
 .Xr newfs 8 ,
 .Xr savecore 8 ,
 .Xr shutdown 8
diff --git a/share/man/man8/man8.amiga/installboot.8 b/share/man/man8/man8.amiga/installboot.8
index c25c03d5e310..71b035bbe3e4 100644
--- a/share/man/man8/man8.amiga/installboot.8
+++ b/share/man/man8/man8.amiga/installboot.8
@@ -1,4 +1,4 @@
-.\"	$NetBSD: installboot.8,v 1.21 2008/04/30 13:10:57 martin Exp $
+.\"	$NetBSD: installboot.8,v 1.22 2017/02/17 22:30:27 christos Exp $
 .\"
 .\" Copyright (c) 1996 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -27,7 +27,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd November 29, 1996
+.Dd February 17, 2017
 .Dt INSTALLBOOT 8 amiga
 .Os
 .Sh NAME
@@ -93,7 +93,7 @@ installboot /usr/mdec/bootxx_ffs /dev/rsd0a
 .Ed
 .Sh SEE ALSO
 .Xr dd 1 ,
-.Xr boot 8
+.Xr amiga/boot 8
 .Sh HISTORY
 The
 .Nm
diff --git a/share/man/man8/man8.atari/ahdilabel.8 b/share/man/man8/man8.atari/ahdilabel.8
index bcc839414baa..7bc02bec571d 100644
--- a/share/man/man8/man8.atari/ahdilabel.8
+++ b/share/man/man8/man8.atari/ahdilabel.8
@@ -1,4 +1,4 @@
-.\"	$NetBSD: ahdilabel.8,v 1.11 2008/04/30 13:10:57 martin Exp $
+.\"	$NetBSD: ahdilabel.8,v 1.12 2017/02/17 22:30:28 christos Exp $
 .\"
 .\"
 .\" Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
 .\" 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.
-.Dd July 29, 2000
+.Dd February 17, 2017
 .Dt AHDILABEL 8 atari
 .Os
 .Sh NAME
@@ -141,9 +141,9 @@ Quit
 .Dl ahdilabel sd0
 Edit the AHDI label for disk sd0.
 .Sh SEE ALSO
-.Xr bootpref 8 ,
+.Xr atari/bootpref 8 ,
 .Xr disklabel 8 ,
-.Xr installboot 8
+.Xr atari/installboot 8
 .Sh HISTORY
 The
 .Nm
diff --git a/share/man/man8/man8.atari/boot.8 b/share/man/man8/man8.atari/boot.8
index 17f08c7497c5..918159f1930d 100644
--- a/share/man/man8/man8.atari/boot.8
+++ b/share/man/man8/man8.atari/boot.8
@@ -1,4 +1,4 @@
-.\"	$NetBSD: boot.8,v 1.13 2009/09/05 11:37:52 wiz Exp $
+.\"	$NetBSD: boot.8,v 1.14 2017/02/17 22:30:28 christos Exp $
 .\"
 .\" Copyright (c) 1990, 1991 The Regents of the University of California.
 .\" All rights reserved.
@@ -34,7 +34,7 @@
 .\"	From:
 .\"	@(#)boot_hp300.8	8.2 (Berkeley) 4/19/94
 .\"
-.Dd April 8, 2003
+.Dd February 17, 2017
 .Dt BOOT 8 atari
 .Os
 .Sh NAME
@@ -67,7 +67,7 @@ attempt a reboot.
 When a bootable
 .Nx
 partition is created by means of
-.Xr installboot 8
+.Xr atari/installboot 8
 and the boot-preference bit in the NVRAM is either invalid or set to
 .Nx
 , the Atari BIOS will automatically start the
diff --git a/share/man/man8/man8.atari/bootpref.8 b/share/man/man8/man8.atari/bootpref.8
index 823802797b65..ab6b13685833 100644
--- a/share/man/man8/man8.atari/bootpref.8
+++ b/share/man/man8/man8.atari/bootpref.8
@@ -1,4 +1,4 @@
-.\" $NetBSD: bootpref.8,v 1.12 2009/04/10 14:59:35 joerg Exp $
+.\" $NetBSD: bootpref.8,v 1.13 2017/02/17 22:30:28 christos Exp $
 .\"
 .\" Copyright (c) 1998 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -27,7 +27,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd January 11, 1998
+.Dd February 17, 2017
 .Dt BOOTPREF 8 atari
 .Os
 .Sh NAME
@@ -180,7 +180,7 @@ If no parameters are specified,
 .Nm bootpref
 shows the current boot preferences.
 .Sh SEE ALSO
-.Xr installboot 8
+.Xr atari/installboot 8
 .Sh HISTORY
 The
 .Nm
diff --git a/share/man/man8/man8.atari/installboot.8 b/share/man/man8/man8.atari/installboot.8
index 1657a8a90ee7..6ed6c5eab195 100644
--- a/share/man/man8/man8.atari/installboot.8
+++ b/share/man/man8/man8.atari/installboot.8
@@ -1,4 +1,4 @@
-.\"	$NetBSD: installboot.8,v 1.13 2008/04/30 13:10:57 martin Exp $
+.\"	$NetBSD: installboot.8,v 1.14 2017/02/17 22:30:28 christos Exp $
 .\"
 .\" Copyright (c) 1996 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -27,7 +27,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd March 9, 2004
+.Dd February 17, 2017
 .Dt INSTALLBOOT 8 atari
 .Os
 .Sh NAME
@@ -150,7 +150,7 @@ boot programs in the bootblock area on
 installboot sd0
 .Ed
 .Sh SEE ALSO
-.Xr bootpref 8 ,
+.Xr atari/bootpref 8 ,
 .Xr disklabel 8
 .Sh HISTORY
 The
diff --git a/share/man/man8/man8.hpcmips/boot.8 b/share/man/man8/man8.hpcmips/boot.8
index 788bbd64441a..13f00fc08fa1 100644
--- a/share/man/man8/man8.hpcmips/boot.8
+++ b/share/man/man8/man8.hpcmips/boot.8
@@ -1,5 +1,5 @@
-.\"	$NetBSD: boot.8,v 1.4 2004/04/03 03:26:29 uwe Exp $
-.Dd May 5, 2003
+.\"	$NetBSD: boot.8,v 1.5 2017/02/17 22:30:28 christos Exp $
+.Dd February 17, 2017
 .Dt BOOT 8 hpcmips
 .Os
 .Sh NAME
@@ -27,7 +27,7 @@ The
 .Nx
 bootloaders are provided as application programs on Windows CE instead.
 You can choose
-.Xr pbsdboot 8
+.Xr hpcmips/pbsdboot 8
 or
 .Xr hpcboot 8 .
 Though the bootloaders are application programs,
@@ -70,7 +70,7 @@ new bootloader executable file for Windows CE
 .\"
 .Xr kloader 4 ,
 .Xr hpcboot 8 ,
-.Xr pbsdboot 8
+.Xr hpcmips/pbsdboot 8
 .\"
 .Sh BUGS
 .\"
diff --git a/share/man/man8/man8.macppc/boot.8 b/share/man/man8/man8.macppc/boot.8
index 5b56a3216794..a62606b20c3f 100644
--- a/share/man/man8/man8.macppc/boot.8
+++ b/share/man/man8/man8.macppc/boot.8
@@ -1,4 +1,4 @@
-.\" $NetBSD: boot.8,v 1.6 2008/05/02 21:10:38 martin Exp $
+.\" $NetBSD: boot.8,v 1.7 2017/02/17 22:30:28 christos Exp $
 .\"
 .\" Copyright (c) 2003 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -27,7 +27,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd March 28, 2004
+.Dd February 17, 2017
 .Dt BOOT 8 macppc
 .Os
 .Sh NAME
@@ -63,7 +63,7 @@ or
 To boot
 .Nx ,
 Open Firmware loads the bootloader
-.Xr ofwboot 8
+.Xr macppc/ofwboot 8
 from the specified
 .Sq Ev boot-device .
 The bootloader then loads the kernel from the
@@ -212,12 +212,12 @@ is used.
 Device from which to load primary bootloader.
 Value depends on a variety of factors.
 See
-.Xr ofwboot 8 .
+.Xr macppc/ofwboot 8 .
 .It Ev boot-file
 Kernel location.
 Value depends on a variety of factors.
 See
-.Xr ofwboot 8 .
+.Xr macppc/ofwboot 8 .
 .Pp
 .It Ev input-device
 What type of console input device
@@ -261,7 +261,7 @@ What type of console output device (On-board video, AGP video, PCI video,
 built-in LCD, or serial console).
 Value depends on a variety of factors.
 See
-.Xr ofwboot 8
+.Xr macppc/ofwboot 8
 and
 .Lk http://www.NetBSD.org/ports/macppc/faq.html#ofw-input-output-devices
 .Pp
@@ -289,7 +289,7 @@ like the following:
 .Ed
 .Pp
 When
-.Xr ofwboot 8
+.Xr macppc/ofwboot 8
 is started, it prints something like the following:
 .Bd -unfilled -offset indent
  \*[Gt]\*[Gt] NetBSD/macppc OpenFirmware Boot, Revision 1.7
@@ -297,7 +297,7 @@ is started, it prints something like the following:
 .Ed
 .Pp
 When
-.Xr ofwboot 8
+.Xr macppc/ofwboot 8
 is loading the kernel, it prints something like the following:
 .Bd -unfilled -offset indent
  4395364+254568 [220144+193803]=0x4d477c
@@ -374,7 +374,7 @@ file systems.
 .Xr halt 8 ,
 .Xr init 8 ,
 .Xr installboot 8 ,
-.Xr ofwboot 8 ,
+.Xr macppc/ofwboot 8 ,
 .Xr rc 8 ,
 .Xr reboot 8 ,
 .Xr savecore 8 ,
diff --git a/share/man/man8/man8.prep/boot.8 b/share/man/man8/man8.prep/boot.8
index cefe5919ec7a..d5c3d02197e2 100644
--- a/share/man/man8/man8.prep/boot.8
+++ b/share/man/man8/man8.prep/boot.8
@@ -1,4 +1,4 @@
-.\" $NetBSD: boot.8,v 1.3 2008/04/30 13:10:58 martin Exp $
+.\" $NetBSD: boot.8,v 1.4 2017/02/17 22:30:28 christos Exp $
 .\" Copyright (c) 2006 The NetBSD Foundation, Inc.
 .\" All rights reserved.
 .\"
@@ -26,7 +26,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd March 23, 2006
+.Dd February 17, 2017
 .Dt BOOT 8 prep
 .Os
 .Sh NAME
@@ -63,7 +63,7 @@ The prep firmware looks for a partition of type 0x41 (65) and
 expects the bootloader, immediately followed by the kernel, to be
 there.
 The
-.Xr mkbootimage 8
+.Xr prep/mkbootimage 8
 command needs to be used to generate this image.
 .Sh FILES
 .Bl -tag -width /usr/mdec/boot_com0xx -compact
@@ -80,7 +80,7 @@ system bootstrap with serial console
 .Xr halt 8 ,
 .Xr init 8 ,
 .Xr installboot 8 ,
-.Xr mkbootimage 8 ,
+.Xr prep/mkbootimage 8 ,
 .Xr rc 8 ,
 .Xr shutdown 8 ,
 .Xr syslogd 8
diff --git a/share/man/man8/man8.prep/mkbootimage.8 b/share/man/man8/man8.prep/mkbootimage.8
index 3e5a6c8424d0..84c05a57666c 100644
--- a/share/man/man8/man8.prep/mkbootimage.8
+++ b/share/man/man8/man8.prep/mkbootimage.8
@@ -1,4 +1,4 @@
-.\" $NetBSD: mkbootimage.8,v 1.6 2011/04/28 16:36:15 wiz Exp $
+.\" $NetBSD: mkbootimage.8,v 1.7 2017/02/17 22:30:28 christos Exp $
 .\" Copyright (c) 2006 The NetBSD Foundation, Inc.
 .\" All rights reserved.
 .\"
@@ -26,7 +26,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd April 30, 2008
+.Dd February 17, 2017
 .Dt MKBOOTIMAGE 8 prep
 .Os
 .Sh NAME
@@ -56,7 +56,7 @@ The image can be written directly to a floppy or hard drive with
 the
 .Xr dd 1
 command, or it can be directly netbooted via
-.Xr bootpd 8 .
+.Xr prep/bootpd 8 .
 .Pp
 The following options are available:
 .Bl -tag -width indent
@@ -139,8 +139,8 @@ to create a new bootable image with com0 as the console:
 .Dl Ic mkbootimage -b /usr/mdec/boot_com0 -k /netbsd -r /dev/rsd0c boot.fs
 .Sh SEE ALSO
 .Xr dd 1 ,
-.Xr boot 8 ,
-.Xr bootpd 8 ,
+.Xr prep/boot 8 ,
+.Xr prep/bootpd 8 ,
 .Xr disklabel 8 ,
 .Xr fdisk 8
 .Sh HISTORY
diff --git a/share/man/man8/man8.sgimips/boot.8 b/share/man/man8/man8.sgimips/boot.8
index 6e32be6c73d2..71c687d4b417 100644
--- a/share/man/man8/man8.sgimips/boot.8
+++ b/share/man/man8/man8.sgimips/boot.8
@@ -1,4 +1,4 @@
-.\"	$NetBSD: boot.8,v 1.6 2009/08/22 00:04:22 joerg Exp $
+.\"	$NetBSD: boot.8,v 1.7 2017/02/17 22:30:28 christos Exp $
 .\"
 .\" Copyright (c) 2006 Stephen M. Rumble
 .\" All rights reserved.
@@ -22,7 +22,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd August 11, 2007
+.Dd February 17, 2017
 .Dt BOOT 8 sgimips
 .Os
 .Sh NAME
@@ -43,7 +43,7 @@ a Volume Header, which contains a boot loader and other standalone utilities.
 Booting
 .Nx
 requires that we write our bootloader into to the volume header using
-.Xr sgivol 8 .
+.Xr sgimips/sgivol 8 .
 .Pp
 Once a bootloader is present in the volume header, it may be executed
 directly by the PROM either manually, or at boot time using the
@@ -101,7 +101,7 @@ as a BOOTP server.
 .Sh SEE ALSO
 .Xr dhcpd.conf 5 ,
 .Xr dhcpd 8 ,
-.Xr sgivol 8
+.Xr sgimips/sgivol 8
 .Sh CAVEATS
 Some older PROM revisions do not support loading of ELF images.
 The build system automatically prepares ECOFF versions, which are
diff --git a/share/man/man8/man8.sgimips/sgivol.8 b/share/man/man8/man8.sgimips/sgivol.8
index 60d800ed5d1a..e2635c705326 100644
--- a/share/man/man8/man8.sgimips/sgivol.8
+++ b/share/man/man8/man8.sgimips/sgivol.8
@@ -1,4 +1,4 @@
-.\"	$NetBSD: sgivol.8,v 1.9 2009/08/22 00:05:13 joerg Exp $
+.\"	$NetBSD: sgivol.8,v 1.10 2017/02/17 22:30:28 christos Exp $
 .\"
 .\" Copyright (c) 2006 Stephen M. Rumble
 .\" All rights reserved.
@@ -22,7 +22,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd August 3, 2008
+.Dd February 17, 2017
 .Dt SGIVOL 8 sgimips
 .Os
 .Sh NAME
@@ -152,4 +152,4 @@ and continue for 28000 blocks on disk
 .Dq sd0 :
 .Dl Ic sgivol -p 0 3200 28000 4 sd0
 .Sh SEE ALSO
-.Xr boot 8
+.Xr sgimips/boot 8
diff --git a/share/man/man8/man8.vax/drtest.8 b/share/man/man8/man8.vax/drtest.8
index f27611922891..e06811c27657 100644
--- a/share/man/man8/man8.vax/drtest.8
+++ b/share/man/man8/man8.vax/drtest.8
@@ -1,4 +1,4 @@
-.\"	$NetBSD: drtest.8,v 1.14 2003/08/07 10:31:28 agc Exp $
+.\"	$NetBSD: drtest.8,v 1.15 2017/02/17 22:30:28 christos Exp $
 .\"
 .\" Copyright (c) 1983, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -29,7 +29,7 @@
 .\"
 .\"     from: @(#)drtest.8	8.1 (Berkeley) 6/5/93
 .\"
-.Dd June 5, 1993
+.Dd February 17, 2017
 .Dt DRTEST 8 vax
 .Os
 .Sh NAME
@@ -45,7 +45,7 @@ useful in other contexts as well, such as
 verifying disks and running speed
 tests. For example, when a disk has been formatted
 (by
-.Xr format 8 ) ,
+.Xr vax/format 8 ) ,
 you can check that
 hard errors has been taken care of by running
 .Nm .
@@ -102,7 +102,7 @@ where
 \&= a*8+u, e.g., hp(1,3) becomes hp11.
 .Sh SEE ALSO
 .Xr bad144 8 ,
-.Xr format 8
+.Xr vax/format 8
 .Sh HISTORY
 The
 .Nm
diff --git a/share/man/man8/man8.vax/format.8 b/share/man/man8/man8.vax/format.8
index 80fccae7ab03..fbacf0db1087 100644
--- a/share/man/man8/man8.vax/format.8
+++ b/share/man/man8/man8.vax/format.8
@@ -1,4 +1,4 @@
-.\"	$NetBSD: format.8,v 1.12 2012/11/13 17:40:56 njoly Exp $
+.\"	$NetBSD: format.8,v 1.13 2017/02/17 22:30:28 christos Exp $
 .\"
 .\" Copyright (c) 1980, 1983, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -29,7 +29,7 @@
 .\"
 .\"	from: @(#)format.8	8.1 (Berkeley) 6/5/93
 .\"
-.Dd April 17, 2003
+.Dd February 17, 2017
 .Dt FORMAT 8 vax
 .Os
 .Sh NAME
@@ -177,7 +177,7 @@ is loaded from the console floppy;
 on an 11/750
 .Nm
 will be loaded from the root file system with
-.Xr boot 8
+.Xr vax/boot 8
 following a
 .Dq B/3
 command.
diff --git a/share/man/man8/man8.x68k/loadbsd.8 b/share/man/man8/man8.x68k/loadbsd.8
index daaf89057e0d..bce8cf428449 100644
--- a/share/man/man8/man8.x68k/loadbsd.8
+++ b/share/man/man8/man8.x68k/loadbsd.8
@@ -1,5 +1,5 @@
-.\"	$NetBSD: loadbsd.8,v 1.4 2001/12/26 02:18:29 wiz Exp $
-.Dd August 13, 1998
+.\"	$NetBSD: loadbsd.8,v 1.5 2017/02/17 22:30:28 christos Exp $
+.Dd February 17, 2017
 .Dt LOADBSD 8 x68k
 .Os
 .Sh NAME
@@ -123,7 +123,7 @@ You will find this program here.
 .El
 .Sh SEE ALSO
 .Xr reboot 2 ,
-.Xr boot 8
+.Xr x68k/boot 8
 .Sh HISTORY
 The
 .Nm
diff --git a/share/man/man8/man8.x68k/newdisk.8 b/share/man/man8/man8.x68k/newdisk.8
index 992ecf46b87a..a9662dba5e3f 100644
--- a/share/man/man8/man8.x68k/newdisk.8
+++ b/share/man/man8/man8.x68k/newdisk.8
@@ -1,4 +1,4 @@
-.\"	$NetBSD: newdisk.8,v 1.10 2014/03/18 18:20:40 riastradh Exp $
+.\"	$NetBSD: newdisk.8,v 1.11 2017/02/17 22:30:28 christos Exp $
 .\"
 .\" Copyright (c) 1998 MINOURA Makoto.
 .\" All rights reserved.
@@ -28,7 +28,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd December 24, 1999
+.Dd February 17, 2017
 .Dt NEWDISK 8 x68k
 .Os
 .Sh NAME
@@ -73,7 +73,7 @@ Specifies the mboot program to be written.
 The default primary boot program.
 .El
 .Sh SEE ALSO
-.Xr boot 8 ,
+.Xr x68k/boot 8 ,
 .Xr installboot 8
 .Sh HISTORY
 The
diff --git a/share/man/man8/man8.x86/boot.8 b/share/man/man8/man8.x86/boot.8
index aa793fd975dc..f02968ebc5e1 100644
--- a/share/man/man8/man8.x86/boot.8
+++ b/share/man/man8/man8.x86/boot.8
@@ -1,4 +1,4 @@
-.\"	$NetBSD: boot.8,v 1.8 2017/02/17 21:31:49 christos Exp $
+.\"	$NetBSD: boot.8,v 1.9 2017/02/17 22:30:28 christos Exp $
 .\"
 .\" Copyright (c) 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -138,7 +138,7 @@ will be used to configure the behaviour of the boot loader including
 setting the timeout, choosing a console device, altering the banner
 text and displaying a menu allowing boot commands to be easily chosen.
 See
-.Xr boot.cfg 5 .
+.Xr x86/boot.cfg 5 .
 .Ss Boot Protocol
 The
 .Nx Ns /x86
@@ -153,7 +153,7 @@ boot protocol, options are passed from the boot loader
 to the kernel via flag bits in the
 .Va boothowto
 variable (see
-.Xr boothowto 9 ) .
+.Xr x86/boothowto 9 ) .
 In the multiboot protocol, options are passed from the boot loader
 to the kernel as strings.
 .Ss Diagnostic Output
@@ -384,7 +384,7 @@ DOM0 kernel before booting the
 .Tn Xen
 hypervisor.
 See
-.Xr boot.cfg 5
+.Xr x86/boot.cfg 5
 for examples.
 .Pp
 In addition to the
@@ -521,7 +521,7 @@ must be passed as options to the
 .Ic multiboot
 command.
 See
-.Xr boot.cfg 5
+.Xr x86/boot.cfg 5
 for examples on how to boot
 .Nx Ns / Ns  Xen.
 .It Nx No multiboot kernels
@@ -630,7 +630,7 @@ file system to mount as root.
 There are three methods:
 .Bl -tag -width 04n -offset 04n
 .It Ic BTINFO_ROOTDEVICE Va from
-.Xr boot.cfg 5
+.Xr x86/boot.cfg 5
 or multiboot.
 The bootloader passes the root device name as driver, unit, and
 partition (like sd0a).
@@ -706,7 +706,7 @@ partition by
 .Xr fd 4 ,
 .Xr pciback 4 ,
 .Xr userconf 4 ,
-.Xr boot.cfg 5 ,
+.Xr x86/boot.cfg 5 ,
 .Xr halt 8 ,
 .Xr installboot 8 ,
 .Xr reboot 8 ,
@@ -717,7 +717,7 @@ partition by
 .Xr x86/mbr 8 ,
 .Xr x86/multiboot 8 ,
 .Xr x86/pxeboot 8 ,
-.Xr boothowto 9
+.Xr x86/boothowto 9
 .Sh BUGS
 The kernel file name must be specified before, not after, the boot options.
 Any
diff --git a/share/man/man8/man8.x86/boot_console.8 b/share/man/man8/man8.x86/boot_console.8
index c2db7d17c2eb..3dcc1c51e8b2 100644
--- a/share/man/man8/man8.x86/boot_console.8
+++ b/share/man/man8/man8.x86/boot_console.8
@@ -1,4 +1,4 @@
-.\"	$NetBSD: boot_console.8,v 1.2 2017/02/17 21:31:49 christos Exp $
+.\"	$NetBSD: boot_console.8,v 1.3 2017/02/17 22:30:28 christos Exp $
 .\"
 .\" Copyright (c) 1997
 .\" 	Matthias Drochner.  All rights reserved.
@@ -130,7 +130,7 @@ compile time options for the boot programs.
 .\"
 .Sh SEE ALSO
 .Xr console 4 ,
-.Xr boot 8 ,
+.Xr x86/boot 8 ,
 .Xr installboot 8
 .\"
 .Sh BUGS
diff --git a/share/man/man8/man8.x86/dosboot.8 b/share/man/man8/man8.x86/dosboot.8
index 56804d593745..4af79b6cba9a 100644
--- a/share/man/man8/man8.x86/dosboot.8
+++ b/share/man/man8/man8.x86/dosboot.8
@@ -1,4 +1,4 @@
-.\"	$NetBSD: dosboot.8,v 1.2 2014/08/16 08:43:12 apb Exp $
+.\"	$NetBSD: dosboot.8,v 1.3 2017/02/17 22:30:28 christos Exp $
 .\"
 .\" Copyright (c) 1997
 .\" 	Matthias Drochner.  All rights reserved.
@@ -26,7 +26,7 @@
 .\"
 .\"     @(#)boot_i386.8	8.2 (Berkeley) 4/19/94
 .\"
-.Dd August 16, 2014
+.Dd February 17, 2017
 .Dt DOSBOOT 8 x86
 .Os
 .Sh NAME
@@ -56,7 +56,7 @@ in the current
 directory.
 .Nm
 shares common code with the standard boot loader,
-.Xr boot 8 .
+.Xr x86/boot 8 .
 .Pp
 The recognized options are:
 .Bl -tag -width "-adqsv" -offset 04n
@@ -93,11 +93,11 @@ Another device or partition can be specified
 by prepending a block device name in terms of
 .Nx ,
 followed by a colon (see
-.Xr boot 8
+.Xr x86/boot 8
 and examples).
 .It Fl adqsv
 Flags passed to the kernel, see
-.Xr boot 8 .
+.Xr x86/boot 8 .
 .El
 .Pp
 The commands accepted after the
@@ -113,7 +113,7 @@ Boot
 See
 .Cm boot
 in
-.Xr boot 8
+.Xr x86/boot 8
 for full details.
 .It Ic dev Op device
 Set the default device and partition for subsequent file system operations.
@@ -169,7 +169,7 @@ dosboot -u fd0a:netbsd -s
 .Ed
 .Sh SEE ALSO
 .Xr release 7 ,
-.Xr boot 8
+.Xr x86/boot 8
 .Sh HISTORY
 The
 .Nx Ns Tn /x86
diff --git a/share/man/man8/man8.x86/mbr.8 b/share/man/man8/man8.x86/mbr.8
index f51a4dc512de..2fec532be96d 100644
--- a/share/man/man8/man8.x86/mbr.8
+++ b/share/man/man8/man8.x86/mbr.8
@@ -1,5 +1,5 @@
-.\"	$NetBSD: mbr.8,v 1.1 2013/07/31 21:01:13 soren Exp $
-.Dd January 20, 2008
+.\"	$NetBSD: mbr.8,v 1.2 2017/02/17 22:30:28 christos Exp $
+.Dd February 17, 2017
 .Dt MBR 8 x86
 .Os
 .Sh NAME
@@ -119,7 +119,7 @@ It may be necessary to reset to the system to continue.
 .Pp
 The bootselect code will output 'Error \*[Lt]code\*[Gt]' and await further input.
 .Sh SEE ALSO
-.Xr boot 8 ,
+.Xr x86/boot 8 ,
 .Xr disklabel 8 ,
 .Xr fdisk 8 ,
 .Xr installboot 8 ,
diff --git a/share/man/man8/man8.x86/pxeboot.8 b/share/man/man8/man8.x86/pxeboot.8
index 35ac17c369ef..f7e7f57fac86 100644
--- a/share/man/man8/man8.x86/pxeboot.8
+++ b/share/man/man8/man8.x86/pxeboot.8
@@ -1,4 +1,4 @@
-.\"	$NetBSD: pxeboot.8,v 1.2 2014/08/16 08:43:12 apb Exp $
+.\"	$NetBSD: pxeboot.8,v 1.3 2017/02/17 22:30:28 christos Exp $
 .\"
 .\" Copyright (c) 2003
 .\" 	Matthias Drochner.  All rights reserved.
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd August 16, 2014
+.Dd February 17, 2017
 .Dt PXEBOOT 8 x86
 .Os
 .Sh NAME
@@ -48,13 +48,13 @@ specification.
 By default, the
 .Nm
 program is configured with modules loading and
-.Xr boot.cfg 5
+.Xr x86/boot.cfg 5
 support disabled.
 See
 .Sx EXAMPLES
 for how to enable these options individually.
 This manual page assumes that
-.Xr boot.cfg 5
+.Xr x86/boot.cfg 5
 support is enabled.
 .Pp
 Network booting a system through
@@ -81,14 +81,14 @@ program takes control.
 It immediately issues another
 .Tn DHCP
 request to get the name of a
-.Xr boot.cfg 5
+.Xr x86/boot.cfg 5
 file to load, using
 .Dq boot.cfg
 by default.
 If the boot config file is not found, or if the supplied file appears
 not to be a boot configuration file, the file is skipped.
 Otherwise it is loaded and obeyed as described in
-.Xr boot.cfg 5 .
+.Xr x86/boot.cfg 5 .
 If a boot configuration is not loaded, the user has the option to
 enter a limited version of the standard interactive boot mode by
 pressing a key within five seconds.
@@ -231,7 +231,7 @@ Boot
 See
 .Cm boot
 in
-.Xr boot 8
+.Xr x86/boot 8
 for full details.
 .It Ic help
 Print an overview about commands and arguments.
@@ -255,7 +255,7 @@ file.
 .El
 .Sh EXAMPLES
 To enable
-.Xr boot.cfg 5
+.Xr x86/boot.cfg 5
 support in the
 .Nm
 program:
@@ -368,8 +368,8 @@ case and by the
 .Nx
 kernel to mount the root file system.
 .Sh SEE ALSO
-.Xr boot.cfg 5 ,
-.Xr boot 8 ,
+.Xr x86/boot.cfg 5 ,
+.Xr x86/boot 8 ,
 .Xr dhcpd 8 ,
 .Xr diskless 8 ,
 .Xr installboot 8
@@ -415,4 +415,4 @@ to the DOM0 kernel as explained
 in the
 .Cm load
 command subsection in
-.Xr boot 8 .
+.Xr x86/boot 8 .