diff --git a/bin/ps/ps.1 b/bin/ps/ps.1
index 21def154ec00..bac86ad8a882 100644
--- a/bin/ps/ps.1
+++ b/bin/ps/ps.1
@@ -780,7 +780,7 @@ Display information on all system processes:
 .Xr strftime 3 ,
 .Xr xo_parse_args 3 ,
 .Xr mac 4 ,
-.Xr procfs 5 ,
+.Xr procfs 4 ,
 .Xr pstat 8 ,
 .Xr sysctl 8 ,
 .Xr mutex 9
diff --git a/contrib/pf/authpf/authpf.8 b/contrib/pf/authpf/authpf.8
index ada4c6a5a11a..70b59ce212c8 100644
--- a/contrib/pf/authpf/authpf.8
+++ b/contrib/pf/authpf/authpf.8
@@ -44,7 +44,7 @@ It is meant to be used with users who can connect via
 only, and requires the
 .Xr pf 4
 subsystem and an
-.Xr fdescfs 5
+.Xr fdescfs 4
 file system mounted at
 .Pa /dev/fd
 to be enabled.
@@ -561,8 +561,8 @@ pass out on $internal_if from (self) to $workstation_ip port 3389 \e
 .It Pa /etc/authpf/authpf.problem
 .El
 .Sh SEE ALSO
+.Xr fdescfs 4 ,
 .Xr pf 4 ,
-.Xr fdescfs 5 ,
 .Xr pf.conf 5 ,
 .Xr securelevel 7 ,
 .Xr ftp-proxy 8
diff --git a/lib/geom/label/glabel.8 b/lib/geom/label/glabel.8
index 6b089172348f..d6f253342905 100644
--- a/lib/geom/label/glabel.8
+++ b/lib/geom/label/glabel.8
@@ -255,7 +255,7 @@ providers implement a
 flag and a tunable variable named in the above format. This flag
 controls if the label provider will be active, tasting devices
 and creating label nodes in the
-.Xr devfs 5
+.Xr devfs 4
 tree. It is sometimes desirable to disable certain label types if
 they conflict with other classes in complex GEOM topologies.
 .El
diff --git a/lib/libc/posix1e/posix1e.3 b/lib/libc/posix1e/posix1e.3
index 8eef3bb21724..1dbe12427da1 100644
--- a/lib/libc/posix1e/posix1e.3
+++ b/lib/libc/posix1e/posix1e.3
@@ -46,7 +46,7 @@ its interfaces are widely used.
 implements POSIX.1e interface for access control lists, described in
 .Xr acl 3 ,
 and supports ACLs on the
-.Xr ffs 7
+.Xr ffs 4
 file system; ACLs must be administratively enabled using
 .Xr tunefs 8 .
 .Pp
@@ -95,7 +95,7 @@ for mandatory access control labels.
 .Xr libcasper 3 ,
 .Xr mac 3 ,
 .Xr capsicum 4 ,
-.Xr ffs 7 ,
+.Xr ffs 4 ,
 .Xr getfmac 8 ,
 .Xr setfmac 8 ,
 .Xr tunefs 8 ,
diff --git a/lib/libsys/execve.2 b/lib/libsys/execve.2
index 8fc1f2529197..5a35980e9555 100644
--- a/lib/libsys/execve.2
+++ b/lib/libsys/execve.2
@@ -325,9 +325,9 @@ argument is not a valid file descriptor open for executing.
 .Xr execl 3 ,
 .Xr exit 3 ,
 .Xr sysctl 3 ,
+.Xr fdescfs 4 ,
 .Xr a.out 5 ,
 .Xr elf 5 ,
-.Xr fdescfs 5 ,
 .Xr environ 7 ,
 .Xr mount 8
 .Sh STANDARDS
@@ -374,6 +374,6 @@ is the file descriptor passed in the
 argument to
 .Fn fexecve .
 For this construction to work correctly, the
-.Xr fdescfs 5
+.Xr fdescfs 4
 filesystem shall be mounted on
 .Pa /dev/fd .
diff --git a/lib/libsys/i386/i386_set_watch.3 b/lib/libsys/i386/i386_set_watch.3
index 68c46e0ec081..265c21119c53 100644
--- a/lib/libsys/i386/i386_set_watch.3
+++ b/lib/libsys/i386/i386_set_watch.3
@@ -110,7 +110,7 @@ or
 is invalid.
 .Sh SEE ALSO
 .Xr ptrace 2 ,
-.Xr procfs 5
+.Xr procfs 4
 .Sh AUTHORS
 This man page was written by
 .An Brian S. Dean .
diff --git a/lib/libsys/mq_open.2 b/lib/libsys/mq_open.2
index 17e290e541ca..484fe95432da 100644
--- a/lib/libsys/mq_open.2
+++ b/lib/libsys/mq_open.2
@@ -223,7 +223,7 @@ and
 system calls are supported for message queue descriptor.
 .Pp
 Please see the
-.Xr mqueuefs 5
+.Xr mqueuefs 4
 man page for instructions on loading the module or compiling the service into
 the kernel.
 .Pp
@@ -310,7 +310,7 @@ There is insufficient space for the creation of the new message queue.
 .Xr mq_unlink 2 ,
 .Xr mq_timedreceive 3 ,
 .Xr mq_timedsend 3 ,
-.Xr mqueuefs 5
+.Xr mqueuefs 4
 .Sh STANDARDS
 The
 .Fn mq_open
diff --git a/lib/libsys/mq_unlink.2 b/lib/libsys/mq_unlink.2
index 07f0364abe00..1bc74b85524f 100644
--- a/lib/libsys/mq_unlink.2
+++ b/lib/libsys/mq_unlink.2
@@ -90,7 +90,7 @@ a pathname component is longer than
 .It Bq Er ENOENT
 The message queue does not exist.
 .It Bq Er ENOSYS
-.Xr mqueuefs 5
+.Xr mqueuefs 4
 module is neither loaded nor included in the kernel.
 .El
 .Sh SEE ALSO
diff --git a/lib/libsys/open.2 b/lib/libsys/open.2
index aac3ef1318f8..be164aae1834 100644
--- a/lib/libsys/open.2
+++ b/lib/libsys/open.2
@@ -384,7 +384,7 @@ The file pointer used to mark the current position within the
 file is set to the beginning of the file.
 .Pp
 If a sleeping open of a device node from
-.Xr devfs 5
+.Xr devfs 4
 is interrupted by a signal, the call always fails with
 .Er EINTR ,
 even if the
diff --git a/lib/libsys/sendfile.2 b/lib/libsys/sendfile.2
index 3ffbd733494d..07a563d5ef82 100644
--- a/lib/libsys/sendfile.2
+++ b/lib/libsys/sendfile.2
@@ -126,7 +126,7 @@ Starting with
 .Fx 11
 .Nm
 sending files off the
-.Xr ffs 7
+.Xr ffs 4
 filesystem does not block on I/O
 (see
 .Sx IMPLEMENTATION NOTES
@@ -209,7 +209,7 @@ The
 implementation of
 .Fn sendfile
 does not block on disk I/O when it sends a file off the
-.Xr ffs 7
+.Xr ffs 4
 filesystem.
 The syscall returns success before the actual I/O completes, and data
 is put into the socket later unattended.
diff --git a/lib/libsys/statfs.2 b/lib/libsys/statfs.2
index 561774f686d8..50809869a022 100644
--- a/lib/libsys/statfs.2
+++ b/lib/libsys/statfs.2
@@ -107,7 +107,7 @@ All I/O to the file system is done synchronously.
 No file system I/O is done synchronously.
 .It Dv MNT_SOFTDEP
 Soft updates being done (see
-.Xr ffs 7 ) .
+.Xr ffs 4 ) .
 .It Dv MNT_GJOURNAL
 Journaling with gjournal is enabled (see
 .Xr gjournal 8 ) .
diff --git a/lib/libufs/libufs.3 b/lib/libufs/libufs.3
index 9547396249de..aa3386ad9771 100644
--- a/lib/libufs/libufs.3
+++ b/lib/libufs/libufs.3
@@ -70,7 +70,7 @@ to a string describing the error.
 .Xr ufs_disk_fillout 3 ,
 .Xr ufs_disk_fillout_blank 3 ,
 .Xr ufs_disk_write 3 ,
-.Xr ffs 7
+.Xr ffs 4
 .Sh HISTORY
 The
 .Xr libufs 3
diff --git a/sbin/devfs/devfs.8 b/sbin/devfs/devfs.8
index 598f2303a605..bbe4825b8bb2 100644
--- a/sbin/devfs/devfs.8
+++ b/sbin/devfs/devfs.8
@@ -38,7 +38,7 @@
 The
 .Nm
 utility provides an interface to manipulate properties of
-.Xr devfs 5
+.Xr devfs 4
 mounts.
 .Pp
 The rules, by default as configured by
@@ -64,7 +64,7 @@ The following flags are common to all keywords:
 Operate on
 .Ar mount-point ,
 which is expected to be a
-.Xr devfs 5
+.Xr devfs 4
 mount.
 If this option is not specified,
 .Nm
@@ -73,7 +73,7 @@ operates on
 .El
 .Ss Rule Subsystem
 The
-.Xr devfs 5
+.Xr devfs 4
 rule subsystem provides a way for the administrator of a system to control
 the attributes of DEVFS nodes.
 .\" XXX devfs node?  entry?  what?
@@ -372,7 +372,7 @@ this feature can be used to copy rulesets:
 .Xr chmod 1 ,
 .Xr jail 2 ,
 .Xr glob 3 ,
-.Xr devfs 5 ,
+.Xr devfs 4 ,
 .Xr devfs.conf 5 ,
 .Xr devfs.rules 5 ,
 .Xr chown 8 ,
diff --git a/sbin/fsck_ffs/fsck_ffs.8 b/sbin/fsck_ffs/fsck_ffs.8
index 1eb9ebeb3b9b..8df5e684b963 100644
--- a/sbin/fsck_ffs/fsck_ffs.8
+++ b/sbin/fsck_ffs/fsck_ffs.8
@@ -421,9 +421,9 @@ are fully enumerated and explained in Appendix A of
 .%T "Fsck \- The UNIX File System Check Program"
 .Re
 .Sh SEE ALSO
+.Xr ffs 4 ,
 .Xr fs 5 ,
 .Xr fstab 5 ,
-.Xr ffs 7 ,
 .Xr fsck 8 ,
 .Xr fsdb 8 ,
 .Xr newfs 8 ,
diff --git a/sbin/mdconfig/mdconfig.8 b/sbin/mdconfig/mdconfig.8
index 938d6ddf12b0..73d4b30aac35 100644
--- a/sbin/mdconfig/mdconfig.8
+++ b/sbin/mdconfig/mdconfig.8
@@ -333,7 +333,7 @@ mdconfig -rs 2g -u md3
 .Ed
 .Pp
 Create a 1 gigabyte swap backed disk, initialize an
-.Xr ffs 7
+.Xr ffs 4
 file system on it, and mount it on
 .Pa /tmp :
 .Bd -literal -offset indent
@@ -366,8 +366,8 @@ mount /dev/md1.nop /mnt
 .Xr fpathconf 2 ,
 .Xr fspacectl 2 ,
 .Xr open 2 ,
+.Xr ffs 4 ,
 .Xr md 4 ,
-.Xr ffs 7 ,
 .Xr gpart 8 ,
 .Xr mdmfs 8 ,
 .Xr malloc 9 ,
diff --git a/sbin/mdmfs/mdmfs.8 b/sbin/mdmfs/mdmfs.8
index 50819bfee0c6..ff5b78068299 100644
--- a/sbin/mdmfs/mdmfs.8
+++ b/sbin/mdmfs/mdmfs.8
@@ -32,7 +32,7 @@
 .Nd configure and mount an in-memory file system using the
 .Xr md 4
 driver or the
-.Xr tmpfs 5
+.Xr tmpfs 4
 filesystem
 .Sh SYNOPSIS
 .Nm
@@ -69,7 +69,7 @@ Based on
 the
 .Nm
 utility either creates a
-.Xr tmpfs 5
+.Xr tmpfs 4
 filesystem, or it configures an
 .Xr md 4
 disk using
@@ -91,7 +91,7 @@ When
 is `auto',
 .Nm
 uses
-.Xr tmpfs 5
+.Xr tmpfs 4
 if it is present in the kernel or can be loaded as a module,
 otherwise it falls back to using
 .Xr md 4
@@ -102,14 +102,14 @@ When
 is `tmpfs',
 .Nm
 mounts a
-.Xr tmpfs 5
+.Xr tmpfs 4
 filesystem, translating the
 .Fl s
 size option, if present, into a `-o size=' mount option.
 Any
 .Fl o
 options on the command line are passed through to the
-.Xr tmpfs 5
+.Xr tmpfs 4
 mount.
 Options specific to
 .Xr mdconfig 8
@@ -120,7 +120,7 @@ are ignored.
 When
 .Ar md-device
 does not result in
-.Xr tmpfs 5
+.Xr tmpfs 4
 being used, then an
 .Xr md 4
 device is configured instead.
@@ -435,8 +435,8 @@ was given on the command line.
 .El
 .Sh SEE ALSO
 .Xr md 4 ,
+.Xr tmpfs 4 ,
 .Xr fstab 5 ,
-.Xr tmpfs 5 ,
 .Xr mdconfig 8 ,
 .Xr mount 8 ,
 .Xr newfs 8
diff --git a/sbin/mknod/mknod.8 b/sbin/mknod/mknod.8
index 99337bd34767..fc562e76f0db 100644
--- a/sbin/mknod/mknod.8
+++ b/sbin/mknod/mknod.8
@@ -107,7 +107,7 @@ will cause the number to be interpreted as octal.
 The
 .Nm
 utility can be used to recreate deleted device nodes under a
-.Xr devfs 5
+.Xr devfs 4
 mount point by invoking it with only a filename as an argument.
 Example:
 .Pp
@@ -129,7 +129,7 @@ devices.
 As of
 .Fx 5.0 ,
 device nodes are managed by the device file system
-.Xr devfs 5 ,
+.Xr devfs 4 ,
 making the
 .Nm
 utility superfluous.
@@ -140,7 +140,7 @@ nodes cannot be used to access devices.
 .Sh SEE ALSO
 .Xr mkfifo 1 ,
 .Xr mknod 2 ,
-.Xr devfs 5 ,
+.Xr devfs 4 ,
 .Xr chown 8
 .Sh HISTORY
 A
diff --git a/sbin/mount/mount.8 b/sbin/mount/mount.8
index e8e604ba4088..ac04ba409ec6 100644
--- a/sbin/mount/mount.8
+++ b/sbin/mount/mount.8
@@ -565,14 +565,14 @@ support for a particular file system might be provided either on a static
 .Xr getmntinfo 3 ,
 .Xr libxo 3 ,
 .Xr xo_parse_args 3 ,
+.Xr cd9660 4 ,
+.Xr devfs 4 ,
+.Xr ext2fs 4 ,
 .Xr mac 4 ,
-.Xr cd9660 5 ,
-.Xr devfs 5 ,
-.Xr ext2fs 5 ,
+.Xr procfs 4 ,
+.Xr tarfs 4 ,
+.Xr tmpfs 4 ,
 .Xr fstab 5 ,
-.Xr procfs 5 ,
-.Xr tarfs 5 ,
-.Xr tmpfs 5 ,
 .Xr automount 8 ,
 .Xr fstyp 8 ,
 .Xr kldload 8 ,
diff --git a/sbin/mount_cd9660/mount_cd9660.8 b/sbin/mount_cd9660/mount_cd9660.8
index d2cdd2f3ef20..017ad7ee9a11 100644
--- a/sbin/mount_cd9660/mount_cd9660.8
+++ b/sbin/mount_cd9660/mount_cd9660.8
@@ -170,7 +170,7 @@ The following command can be used to mount a Kodak Photo-CD:
 .Xr cdcontrol 1 ,
 .Xr mount 2 ,
 .Xr unmount 2 ,
-.Xr cd9660 5 ,
+.Xr cd9660 4 ,
 .Xr fstab 5 ,
 .Xr mdconfig 8 ,
 .Xr mount 8
diff --git a/sbin/mount_msdosfs/mount_msdosfs.8 b/sbin/mount_msdosfs/mount_msdosfs.8
index 94532cafb543..3a97089e220c 100644
--- a/sbin/mount_msdosfs/mount_msdosfs.8
+++ b/sbin/mount_msdosfs/mount_msdosfs.8
@@ -179,8 +179,8 @@ To mount a Japanese MS-DOS file system located in
 .Sh SEE ALSO
 .Xr mount 2 ,
 .Xr unmount 2 ,
+.Xr msdosfs 4 ,
 .Xr fstab 5 ,
-.Xr msdosfs 5 ,
 .Xr mount 8
 .Pp
 List of Localized MS Operating Systems:
diff --git a/sbin/mount_nfs/mount_nfs.8 b/sbin/mount_nfs/mount_nfs.8
index 3ef622a96dc0..13f0608ccad9 100644
--- a/sbin/mount_nfs/mount_nfs.8
+++ b/sbin/mount_nfs/mount_nfs.8
@@ -648,7 +648,7 @@ named options are equivalent to other
 .Fl o
 named options and are supported for compatibility with other
 operating systems (e.g., Linux, Solaris, and OSX) to ease usage of
-.Xr autofs 5
+.Xr autofs 4
 support.
 .Bl -tag -width indent
 .It Fl o Cm vers Ns = Ns 2
diff --git a/sbin/mount_nullfs/mount_nullfs.8 b/sbin/mount_nullfs/mount_nullfs.8
index 8638c25c0610..17b1f45f5e42 100644
--- a/sbin/mount_nullfs/mount_nullfs.8
+++ b/sbin/mount_nullfs/mount_nullfs.8
@@ -45,7 +45,7 @@
 The
 .Nm
 utility creates a
-.Xr nullfs 5
+.Xr nullfs 4
 layer, duplicating a sub-tree of the file system
 name space under another part of the global file system namespace.
 This allows existing files and directories to be accessed
@@ -257,7 +257,7 @@ is that vnode arguments must be manually mapped.
 .\"
 .\"
 .Sh SEE ALSO
-.Xr nullfs 5 ,
+.Xr nullfs 4 ,
 .Xr mount 8
 .Pp
 UCLA Technical Report CSD-910056,
diff --git a/sbin/reboot/reboot.8 b/sbin/reboot/reboot.8
index ed055327b36a..59cbd9de7519 100644
--- a/sbin/reboot/reboot.8
+++ b/sbin/reboot/reboot.8
@@ -175,7 +175,7 @@ After changing vfs.root.mountfrom with
 .Nm Fl r
 can be used to change the root filesystem while preserving kernel state.
 This requires the
-.Xr tmpfs 5
+.Xr tmpfs 4
 kernel module to be loaded because
 .Xr init 8
 needs a place to store itself after the old root is unmounted, but
diff --git a/sbin/tunefs/tunefs.8 b/sbin/tunefs/tunefs.8
index 97de1abf33c0..0fb11041d97d 100644
--- a/sbin/tunefs/tunefs.8
+++ b/sbin/tunefs/tunefs.8
@@ -215,8 +215,8 @@ read this to determine the device file for a
 specified mount point.
 .El
 .Sh SEE ALSO
+.Xr ffs 4 ,
 .Xr fs 5 ,
-.Xr ffs 7 ,
 .Xr tuning 7 ,
 .Xr dumpfs 8 ,
 .Xr gjournal 8 ,
diff --git a/share/man/man3/makedev.3 b/share/man/man3/makedev.3
index 4cf851f87508..3c0e176a0621 100644
--- a/share/man/man3/makedev.3
+++ b/share/man/man3/makedev.3
@@ -97,4 +97,4 @@ macros return numbers whose value can span the complete range of an
 .Sh SEE ALSO
 .Xr mknod 2 ,
 .Xr devname 3 ,
-.Xr devfs 5
+.Xr devfs 4
diff --git a/share/man/man4/cd.4 b/share/man/man4/cd.4
index 7c3fa6ed9850..b05e486af6b6 100644
--- a/share/man/man4/cd.4
+++ b/share/man/man4/cd.4
@@ -335,9 +335,9 @@ devices
 .Sh DIAGNOSTICS
 None.
 .Sh SEE ALSO
+.Xr cd9660 4 ,
 .Xr cam 4 ,
 .Xr da 4 ,
-.Xr cd9660 5 ,
 .Xr disklabel 8 ,
 .Xr cd 9
 .Sh HISTORY
diff --git a/share/man/man4/devfs.4 b/share/man/man4/devfs.4
index c90835570127..3022a23dfe9a 100644
--- a/share/man/man4/devfs.4
+++ b/share/man/man4/devfs.4
@@ -65,13 +65,13 @@ tool can be used to recover deleted device entries under
 .Nm .
 .Pp
 The
-.Xr fdescfs 5
+.Xr fdescfs 4
 filesystem is an alternate means for populating
 .Pa /dev/fd .
 The character devices that both
 .Nm
 and
-.Xr fdescfs 5
+.Xr fdescfs 4
 present in
 .Pa /dev/fd
 correspond to the open file descriptors of the process
@@ -82,7 +82,7 @@ only creates files for the standard file descriptors
 .Pa 1
 and
 .Pa 2 .
-.Xr fdescfs 5
+.Xr fdescfs 4
 creates files for all open descriptors.
 .Pp
 The options are as follows:
@@ -123,7 +123,7 @@ volume located on
 .Pp
 .Dl "mount -t devfs devfs /mychroot/dev"
 .Sh SEE ALSO
-.Xr fdescfs 5 ,
+.Xr fdescfs 4 ,
 .Xr devfs 8 ,
 .Xr mount 8 ,
 .Xr make_dev 9
diff --git a/share/man/man4/fd.4 b/share/man/man4/fd.4
index f91c0e0501fb..06cc12d25696 100644
--- a/share/man/man4/fd.4
+++ b/share/man/man4/fd.4
@@ -78,11 +78,11 @@ are ignored.
 By default,
 .Pa /dev/fd
 is provided by
-.Xr devfs 5 ,
+.Xr devfs 4 ,
 which provides nodes for the first three file descriptors.
 Some sites may require nodes for additional file descriptors; these can be
 made available by mounting
-.Xr fdescfs 5
+.Xr fdescfs 4
 on
 .Pa /dev/fd .
 .Sh FILES
@@ -93,6 +93,6 @@ on
 .It Pa /dev/stderr
 .El
 .Sh SEE ALSO
-.Xr tty 4 ,
-.Xr devfs 5 ,
-.Xr fdescfs 5
+.Xr devfs 4 ,
+.Xr fdescfs 4 ,
+.Xr tty 4
diff --git a/share/man/man4/fdescfs.4 b/share/man/man4/fdescfs.4
index 4b51c2bad369..b050f024ac40 100644
--- a/share/man/man4/fdescfs.4
+++ b/share/man/man4/fdescfs.4
@@ -196,7 +196,7 @@ flag use:
 .Pp
 .Dl "mount -t fdescfs -o nodup none /dev/fdpath"
 .Sh SEE ALSO
-.Xr devfs 5 ,
+.Xr devfs 4 ,
 .Xr mount 8
 .Sh HISTORY
 The
diff --git a/share/man/man4/intro.4 b/share/man/man4/intro.4
index 9b22e89ff6c3..e4caf6690efb 100644
--- a/share/man/man4/intro.4
+++ b/share/man/man4/intro.4
@@ -77,7 +77,7 @@ are accessed through
 sometimes also called
 .Em special files .
 They are located within instances of the
-.Xr devfs 5
+.Xr devfs 4
 filesystem, which is conventionally mounted on the directory
 .Pa /dev
 in the file system hierarchy
@@ -85,7 +85,7 @@ in the file system hierarchy
 .Xr hier 7 ) .
 .Pp
 The
-.Xr devfs 5
+.Xr devfs 4
 filesystem creates or removes device nodes automatically according to
 the physical hardware recognized as present at any given time.
 For pseudo-devices, device nodes may be created and removed dynamically
@@ -104,7 +104,7 @@ or set using the
 command.
 In the latter case, different rules may be used to make different sets
 of devices visible within different instances of the
-.Xr devfs 5
+.Xr devfs 4
 filesystem, which may be used, for example, to prevent jailed
 subsystems from accessing unsafe devices.
 Manual changes to device
@@ -200,7 +200,7 @@ device.
 .Xr select 2 ,
 .Xr socket 2 ,
 .Xr write 2 ,
-.Xr devfs 5 ,
+.Xr devfs 4 ,
 .Xr hier 7 ,
 .Xr config 8
 .Sh HISTORY
diff --git a/share/man/man4/kld.4 b/share/man/man4/kld.4
index bba32f02e677..e0186dec9ccc 100644
--- a/share/man/man4/kld.4
+++ b/share/man/man4/kld.4
@@ -96,7 +96,7 @@ drivers may be loaded into the system with
 .Nm .
 Device nodes for the loaded drivers are automatically created when a
 module is loaded and destroyed when it is unloaded by
-.Xr devfs 5 .
+.Xr devfs 4 .
 You can specify userland programs that will run when new devices
 become available as a result of loading modules, or existing devices
 go away when modules are unloaded, by configuring
@@ -121,7 +121,7 @@ example source code implementing a sample kld module
 .Xr kldnext 2 ,
 .Xr kldstat 2 ,
 .Xr kldunload 2 ,
-.Xr devfs 5 ,
+.Xr devfs 4 ,
 .Xr devd 8 ,
 .Xr kldload 8 ,
 .Xr kldstat 8 ,
diff --git a/share/man/man4/lindebugfs.4 b/share/man/man4/lindebugfs.4
index d78a12c44714..25a398a93f22 100644
--- a/share/man/man4/lindebugfs.4
+++ b/share/man/man4/lindebugfs.4
@@ -77,8 +77,8 @@ file system on
 .Pp
 .Dl "mount -t lindebugfs lindebugfs /sys/kernel/debug"
 .Sh SEE ALSO
-.Xr linprocfs 5 ,
-.Xr linsysfs 5 ,
+.Xr linprocfs 4 ,
+.Xr linsysfs 4 ,
 .Xr pseudofs 9 ,
 .Xr linux 4 ,
 .Xr mount 1
diff --git a/share/man/man4/linsysfs.4 b/share/man/man4/linsysfs.4
index 64270fe753d4..12729a814085 100644
--- a/share/man/man4/linsysfs.4
+++ b/share/man/man4/linsysfs.4
@@ -74,8 +74,8 @@ is a mount point.
 .Sh SEE ALSO
 .Xr nmount 2 ,
 .Xr unmount 2 ,
+.Xr linprocfs 4 ,
 .Xr linux 4 ,
-.Xr linprocfs 5 ,
 .Xr pseudofs 9
 .Sh HISTORY
 The
@@ -93,6 +93,6 @@ by
 This manual page was edited by
 .An Doug Ambrisko ,
 based on the
-.Xr linprocfs 5
+.Xr linprocfs 4
 manual page by
 .An Garrett Wollman .
diff --git a/share/man/man4/linux.4 b/share/man/man4/linux.4
index 0efc469985f9..a50e1513ba43 100644
--- a/share/man/man4/linux.4
+++ b/share/man/man4/linux.4
@@ -156,30 +156,30 @@ Defaults to 0.
 Linux run-time environment
 .It Pa /compat/linux/dev
 device file system, see
-.Xr devfs 5
+.Xr devfs 4
 .It Pa /compat/linux/dev/fd
 file descriptor file system mounted with the
 .Cm linrdlnk
 option, see
-.Xr fdescfs 5
+.Xr fdescfs 4
 .It Pa /compat/linux/dev/shm
 in-memory file system, see
-.Xr tmpfs 5
+.Xr tmpfs 4
 .It Pa /compat/linux/proc
 Linux process file system, see
-.Xr linprocfs 5
+.Xr linprocfs 4
 .It Pa /compat/linux/sys
 Linux kernel objects file system, see
-.Xr linsysfs 5
+.Xr linsysfs 4
 .El
 .Sh SEE ALSO
 .Xr brandelf 1 ,
+.Xr fdescfs 4 ,
+.Xr linprocfs 4 ,
+.Xr linsysfs 4 ,
 .Xr pty 4 ,
-.Xr elf 5 ,
-.Xr fdescfs 5 ,
-.Xr linprocfs 5 ,
-.Xr linsysfs 5 ,
-.Xr tmpfs 5
+.Xr tmpfs 4 ,
+.Xr elf 5
 .Sh HISTORY
 Linux ABI support first appeared for i386 in
 .Fx 2.1 .
diff --git a/share/man/man4/mlx5io.4 b/share/man/man4/mlx5io.4
index 66a767d97d31..ebfbb41a0823 100644
--- a/share/man/man4/mlx5io.4
+++ b/share/man/man4/mlx5io.4
@@ -172,7 +172,7 @@ field reports the third page validity.
 .Sh FILES
 The
 .Pa /dev/mlx5ctl
-.Xr devfs 5
+.Xr devfs 4
 node is used to pass commands to the driver.
 .Sh RETURN VALUES
 If successful, the IOCTL returns zero.
diff --git a/share/man/man4/pcm.4 b/share/man/man4/pcm.4
index 5fcaca7220b9..769f562fe91e 100644
--- a/share/man/man4/pcm.4
+++ b/share/man/man4/pcm.4
@@ -285,7 +285,7 @@ Use the most recently attached device.
 .It Va hw.snd.default_unit
 Default sound card for systems with multiple sound cards.
 When using
-.Xr devfs 5 ,
+.Xr devfs 4 ,
 the default device for
 .Pa /dev/dsp .
 Equivalent to a symlink from
@@ -597,6 +597,7 @@ or outgoing (record) data.
 A device node is not created properly.
 .El
 .Sh SEE ALSO
+.Xr devfs 4 ,
 .Xr snd_ai2s 4 ,
 .Xr snd_als4000 4 ,
 .Xr snd_atiixp 4 ,
@@ -623,7 +624,6 @@ A device node is not created properly.
 .Xr snd_via8233 4 ,
 .Xr snd_via82c686 4 ,
 .Xr snd_vibes 4 ,
-.Xr devfs 5 ,
 .Xr device.hints 5 ,
 .Xr loader.conf 5 ,
 .Xr dmesg 8 ,
diff --git a/share/man/man5/devfs.conf.5 b/share/man/man5/devfs.conf.5
index e95c7b578bf5..f7141b76c3f6 100644
--- a/share/man/man5/devfs.conf.5
+++ b/share/man/man5/devfs.conf.5
@@ -54,7 +54,7 @@ The action to take for the device.
 The action names are only significant to the first unique character.
 .It Ar devname
 The name of the device created by
-.Xr devfs 5 .
+.Xr devfs 4 .
 .It Ar arg
 The argument of the
 .Ar action .
@@ -68,7 +68,7 @@ This action creates a symbolic link named
 that points to
 .Ar devname ,
 the name of the device created by
-.Xr devfs 5 .
+.Xr devfs 4 .
 .It Ic own
 This action changes the ownership of
 .Ar devname .
@@ -118,8 +118,8 @@ perm	cd0	0660
 .Ed
 .Sh SEE ALSO
 .Xr chmod 1 ,
+.Xr devfs 4 ,
 .Xr devd.conf 5 ,
-.Xr devfs 5 ,
 .Xr devfs.rules 5 ,
 .Xr chown 8
 .Sh AUTHORS
diff --git a/share/man/man5/devfs.rules.5 b/share/man/man5/devfs.rules.5
index 368a7696b5cd..e878c2a97738 100644
--- a/share/man/man5/devfs.rules.5
+++ b/share/man/man5/devfs.rules.5
@@ -124,7 +124,7 @@ group, a similar rule may be used:
 .Dl "add path 'usb/*' mode 0660 group usb"
 .Sh SEE ALSO
 .Xr glob 3 ,
-.Xr devfs 5 ,
+.Xr devfs 4 ,
 .Xr devfs.conf 5 ,
 .Xr devfs 8 ,
 .Xr service 8
diff --git a/share/man/man5/fstab.5 b/share/man/man5/fstab.5
index 9cdcf818cf32..787fe3933aca 100644
--- a/share/man/man5/fstab.5
+++ b/share/man/man5/fstab.5
@@ -113,7 +113,7 @@ flag.
 Other options need both the file system specific flag and its argument,
 separated by an equal sign.
 For example, mounting an
-.Xr msdosfs 5
+.Xr msdosfs 4
 filesystem, the options
 .Bd -literal -offset indent
 -o sync -o noatime -m 644 -M 755 -u foo -g bar
diff --git a/share/man/man5/mount.conf.5 b/share/man/man5/mount.conf.5
index 633a642e37be..4b5c272ef601 100644
--- a/share/man/man5/mount.conf.5
+++ b/share/man/man5/mount.conf.5
@@ -50,7 +50,7 @@ The logic for this is in
 .Fn vfs_mountroot_conf0 .
 .It
 The kernel will first mount
-.Xr devfs 5
+.Xr devfs 4
 as the root file system.
 .It
 Next, the kernel will parse the in-memory config file created in step 1
@@ -60,7 +60,7 @@ See
 for the format of the config file.
 .It
 When the actual root file system is mounted,
-.Xr devfs 5
+.Xr devfs 4
 will be re-mounted on the
 .Pa /dev
 directory.
@@ -221,7 +221,7 @@ For each root file system which is mounted, a
 directory
 .Em must
 exist so that the root mount logic can properly re-mount
-.Xr devfs 5 .
+.Xr devfs 4 .
 If this directory does not exist, the system
 may hang during the bootup process.
 .Sh SEE ALSO
diff --git a/share/man/man7/hier.7 b/share/man/man7/hier.7
index 7d164b5683d6..e0a6ff3dfefc 100644
--- a/share/man/man7/hier.7
+++ b/share/man/man7/hier.7
@@ -128,7 +128,7 @@ compatibility run-time
 device nodes and special files; see
 .Xr intro 4
 and
-.Xr devfs 5
+.Xr devfs 4
 .Pp
 .Bl -tag -width "loader.conf.d" -compact
 .It Pa ada0
@@ -365,7 +365,7 @@ that need no home directory; see also
 .Pa /var/empty/
 .It Pa /proc/
 process file system; see
-.Xr procfs 5
+.Xr procfs 4
 .It Pa /rescue/
 statically linked programs for emergency recovery; see
 .Xr rescue 8
diff --git a/share/man/man7/tuning.7 b/share/man/man7/tuning.7
index f04500d0f0dc..caa1efb7d450 100644
--- a/share/man/man7/tuning.7
+++ b/share/man/man7/tuning.7
@@ -695,10 +695,10 @@ over services you export from your box (web services, email).
 .Xr ata 4 ,
 .Xr dummynet 4 ,
 .Xr eventtimers 4 ,
+.Xr ffs 4 ,
 .Xr login.conf 5 ,
 .Xr rc.conf 5 ,
 .Xr sysctl.conf 5 ,
-.Xr ffs 7 ,
 .Xr firewall 7 ,
 .Xr hier 7 ,
 .Xr ports 7 ,
diff --git a/share/man/man8/uefi.8 b/share/man/man8/uefi.8
index 42642bb48260..7a684f6b092b 100644
--- a/share/man/man8/uefi.8
+++ b/share/man/man8/uefi.8
@@ -45,7 +45,7 @@ The
 boot process loads system bootstrap code located in an EFI System Partition
 (ESP).
 The ESP is a GPT or MBR partition with a specific identifier that contains an
-.Xr msdosfs 5
+.Xr msdosfs 4
 FAT file system with a specified file hierarchy.
 .Bl -column -offset indent "Partition Scheme" "ESP Identifier"
 .It Sy "Partition Scheme" Ta Sy "ESP Identifier"
@@ -110,7 +110,7 @@ Typical non-default kernel (optional)
 .Sh SEE ALSO
 .Xr vt 4 ,
 .Xr boot.config 5 ,
-.Xr msdosfs 5 ,
+.Xr msdosfs 4 ,
 .Xr boot 8 ,
 .Xr efibootmgr 8 ,
 .Xr efidp 8 ,
diff --git a/share/man/man9/DEVICE_ATTACH.9 b/share/man/man9/DEVICE_ATTACH.9
index 0946e1f13b7c..083a0e86f0bc 100644
--- a/share/man/man9/DEVICE_ATTACH.9
+++ b/share/man/man9/DEVICE_ATTACH.9
@@ -46,7 +46,7 @@ The
 .Fn DEVICE_ATTACH
 method should initialize the hardware and allocate other
 system resources (such as
-.Xr devfs 5
+.Xr devfs 4
 entries).
 .Pp
 Devices which implement buses should use this method to probe for
@@ -58,7 +58,7 @@ the child devices will be automatically probed and attached.
 .Sh RETURN VALUES
 Zero is returned on success, otherwise an appropriate error is returned.
 .Sh SEE ALSO
-.Xr devfs 5 ,
+.Xr devfs 4 ,
 .Xr device 9 ,
 .Xr DEVICE_DETACH 9 ,
 .Xr DEVICE_IDENTIFY 9 ,
diff --git a/share/man/man9/dev_clone.9 b/share/man/man9/dev_clone.9
index f5f59e3c6666..56bdd1a9a248 100644
--- a/share/man/man9/dev_clone.9
+++ b/share/man/man9/dev_clone.9
@@ -42,7 +42,7 @@ EVENTHANDLER_REGISTER(dev_clone, clone_handler, arg, priority);
 .Sh DESCRIPTION
 A device driver may register a listener that will be notified each time
 a name lookup on the
-.Xr devfs 5
+.Xr devfs 4
 mount point fails to find the vnode.
 A listener shall be registered for the
 .Va dev_clone
@@ -72,5 +72,5 @@ that were started before
 .Fn drain_dev_clone_events
 call, are finished before it returns control.
 .Sh SEE ALSO
-.Xr devfs 5 ,
+.Xr devfs 4 ,
 .Xr namei 9
diff --git a/share/man/man9/dev_refthread.9 b/share/man/man9/dev_refthread.9
index e12b5f49a0e5..f615725b0a47 100644
--- a/share/man/man9/dev_refthread.9
+++ b/share/man/man9/dev_refthread.9
@@ -47,7 +47,7 @@ The
 and
 .Fn dev_relthread
 routines provide a safe way to access
-.Xr devfs 5
+.Xr devfs 4
 devices that may be concurrently destroyed by
 .Fn destroy_dev
 (e.g., removable media).
@@ -143,7 +143,7 @@ and do not initialize the value pointed to by the
 parameter in any way.
 .Ef
 .Sh SEE ALSO
-.Xr devfs 5 ,
+.Xr devfs 4 ,
 .Xr destroy_dev 9
 .Sh CAVEATS
 Do not invoke
diff --git a/share/man/man9/devfs_set_cdevpriv.9 b/share/man/man9/devfs_set_cdevpriv.9
index 3258ca082e5f..0cbfd3eebeb7 100644
--- a/share/man/man9/devfs_set_cdevpriv.9
+++ b/share/man/man9/devfs_set_cdevpriv.9
@@ -62,7 +62,7 @@ Currently, functioning of these functions is restricted to the context
 of the
 .Fa cdevsw
 switch method calls performed as
-.Xr devfs 5
+.Xr devfs 4
 operations in response to system calls that use filedescriptors.
 .Pp
 The
@@ -151,7 +151,7 @@ any blockable locking inside the callback
 .Sh SEE ALSO
 .Xr close 2 ,
 .Xr open 2 ,
-.Xr devfs 5
+.Xr devfs 4
 .Sh HISTORY
 The
 .Fn devfs_cdevpriv
diff --git a/share/man/man9/disk.9 b/share/man/man9/disk.9
index 047abb96c619..41436427cbc2 100644
--- a/share/man/man9/disk.9
+++ b/share/man/man9/disk.9
@@ -51,7 +51,7 @@ disk-like storage devices to advertise the device to other kernel
 components, including
 .Xr GEOM 4
 and
-.Xr devfs 5 .
+.Xr devfs 4 .
 .Pp
 Each disk device is described by a
 .Vt "struct disk"
@@ -242,8 +242,8 @@ Typically used to store a pointer to the drivers
 structure for this disk device.
 .El
 .Sh SEE ALSO
-.Xr GEOM 4 ,
-.Xr devfs 5
+.Xr devfs 4 ,
+.Xr GEOM 4
 .Sh HISTORY
 The
 .Nm kernel disk storage API
diff --git a/share/man/man9/g_provider.9 b/share/man/man9/g_provider.9
index d421af3b1264..940772b26fa5 100644
--- a/share/man/man9/g_provider.9
+++ b/share/man/man9/g_provider.9
@@ -50,7 +50,7 @@ The
 function creates a new provider on given geom
 .Fa gp .
 The name of the provider, which will appear as device in
-.Xr devfs 5 ,
+.Xr devfs 4 ,
 is created
 in a
 .Xr printf 3 Ns
diff --git a/share/man/man9/make_dev.9 b/share/man/man9/make_dev.9
index 2beb38586593..5428b4c7a74e 100644
--- a/share/man/man9/make_dev.9
+++ b/share/man/man9/make_dev.9
@@ -81,7 +81,7 @@ structure for a new device, which is returned into the
 .Fa cdev
 argument.
 It also notifies
-.Xr devfs 5
+.Xr devfs 4
 of the presence of the new device, that causes corresponding nodes
 to be created.
 Besides this, a
@@ -123,7 +123,7 @@ would print it.
 The name determines its path under
 .Pa /dev
 or other
-.Xr devfs 5
+.Xr devfs 4
 mount point and may contain slash
 .Ql /
 characters to denote subdirectories.
@@ -457,7 +457,7 @@ flag was specified and the provided device name already exists.
 .El
 .Sh SEE ALSO
 .Xr devctl 4 ,
-.Xr devfs 5 ,
+.Xr devfs 4 ,
 .Xr dev_clone 9
 .Sh HISTORY
 The
diff --git a/share/man/man9/pseudofs.9 b/share/man/man9/pseudofs.9
index e076c398c711..d87bbb0030c7 100644
--- a/share/man/man9/pseudofs.9
+++ b/share/man/man9/pseudofs.9
@@ -36,9 +36,9 @@
 The
 .Nm
 module offers an abstract API for pseudo-file systems such as
-.Xr procfs 5
+.Xr procfs 4
 and
-.Xr linprocfs 5 .
+.Xr linprocfs 4 .
 It takes care of all the hairy bits like interfacing with the VFS
 system, enforcing access control, keeping track of file numbers, and
 cloning files and directories that are process-specific.
@@ -51,9 +51,9 @@ and callbacks that report file attributes or write the actual file
 contents into sbufs.
 .\" Insert more info here
 .Sh SEE ALSO
-.Xr linprocfs 5 ,
-.Xr linsysfs 5 ,
-.Xr procfs 5 ,
+.Xr linprocfs 4 ,
+.Xr linsysfs 4 ,
+.Xr procfs 4 ,
 .Xr sbuf 9 ,
 .Xr vnode 9
 .Sh HISTORY
diff --git a/tools/build/options/WITHOUT_AUTOFS b/tools/build/options/WITHOUT_AUTOFS
index fa8ff52d13e3..4e4047dda97f 100644
--- a/tools/build/options/WITHOUT_AUTOFS
+++ b/tools/build/options/WITHOUT_AUTOFS
@@ -1,3 +1,3 @@
 Do not build
-.Xr autofs 5
+.Xr autofs 4
 related programs, libraries, and kernel modules.
diff --git a/usr.bin/lsvfs/lsvfs.1 b/usr.bin/lsvfs/lsvfs.1
index 082023f00857..9871df32fa96 100644
--- a/usr.bin/lsvfs/lsvfs.1
+++ b/usr.bin/lsvfs/lsvfs.1
@@ -47,7 +47,7 @@ flag bits.
 Show information about the
 .Ql ufs
 and
-.Xr devfs 5
+.Xr devfs 4
 filesystems and check the number of mounts for the former:
 .Bd -literal -offset indent
 $ lsvfs ufs devfs
diff --git a/usr.bin/posixmqcontrol/posixmqcontrol.1 b/usr.bin/posixmqcontrol/posixmqcontrol.1
index ec60230aac6e..67ddbfd5eaf0 100644
--- a/usr.bin/posixmqcontrol/posixmqcontrol.1
+++ b/usr.bin/posixmqcontrol/posixmqcontrol.1
@@ -164,7 +164,7 @@ use the command
 .Xr mq_send 2 ,
 .Xr mq_setattr 2 ,
 .Xr mq_unlink 2 ,
-.Xr mqueuefs 5
+.Xr mqueuefs 4
 .Sh BUGS
 mq_timedsend and mq_timedrecv are not implemented.
 info reports a worst-case estimate for QSIZE.
diff --git a/usr.sbin/autofs/auto_master.5 b/usr.sbin/autofs/auto_master.5
index e826176f9f3f..30c78cc26766 100644
--- a/usr.sbin/autofs/auto_master.5
+++ b/usr.sbin/autofs/auto_master.5
@@ -361,7 +361,7 @@ Directory containing shell scripts to implement special maps and directory
 services.
 .El
 .Sh SEE ALSO
-.Xr autofs 5 ,
+.Xr autofs 4 ,
 .Xr automount 8 ,
 .Xr automountd 8 ,
 .Xr autounmountd 8
diff --git a/usr.sbin/autofs/automount.8 b/usr.sbin/autofs/automount.8
index 3dc423c3054f..953b3c265178 100644
--- a/usr.sbin/autofs/automount.8
+++ b/usr.sbin/autofs/automount.8
@@ -46,7 +46,7 @@ command parses the
 .Xr auto_master 5
 configuration file and any direct maps that it references, and mounts
 or unmounts
-.Xr autofs 5
+.Xr autofs 4
 filesystems to match.
 These options are available:
 .Bl -tag -width ".Fl v"
@@ -75,10 +75,10 @@ It is only useful with
 .It Fl u
 Try to unmount filesystems mounted by
 .Xr automountd 8 .
-.Xr autofs 5
+.Xr autofs 4
 mounts are not unmounted.
 To unmount all
-.Xr autofs
+.Xr autofs 4
 mounts, use
 .Cm "umount -At autofs".
 .It Fl v
@@ -91,8 +91,8 @@ Unmount all filesystems mounted by
 .Xr automountd 8 :
 .Dl Nm Fl u
 .Sh SEE ALSO
+.Xr autofs 4 ,
 .Xr auto_master 5 ,
-.Xr autofs 5 ,
 .Xr automountd 8 ,
 .Xr autounmountd 8
 .Sh HISTORY
diff --git a/usr.sbin/autofs/automountd.8 b/usr.sbin/autofs/automountd.8
index 4b2cf7d56336..0384fe2e7ed2 100644
--- a/usr.sbin/autofs/automountd.8
+++ b/usr.sbin/autofs/automountd.8
@@ -42,7 +42,7 @@
 The
 .Nm
 daemon is responsible for handling
-.Xr autofs 5
+.Xr autofs 4
 mount requests, parsing maps,
 and mounting filesystems they specify.
 On startup,
@@ -83,8 +83,8 @@ Increase verbosity.
 .Sh EXIT STATUS
 .Ex -std
 .Sh SEE ALSO
+.Xr autofs 4 ,
 .Xr auto_master 5 ,
-.Xr autofs 5 ,
 .Xr automount 8 ,
 .Xr autounmountd 8
 .Sh HISTORY
diff --git a/usr.sbin/extattrctl/extattrctl.8 b/usr.sbin/extattrctl/extattrctl.8
index 845929ac9ed2..ea5f69c61126 100644
--- a/usr.sbin/extattrctl/extattrctl.8
+++ b/usr.sbin/extattrctl/extattrctl.8
@@ -165,7 +165,7 @@ Disable the attribute named md5 on the root file system.
 .Pp
 Stop extended attributes on the root file system.
 .Sh SEE ALSO
-.Xr ffs 7 ,
+.Xr ffs 4 ,
 .Xr getextattr 8 ,
 .Xr setextattr 8 ,
 .Xr extattr 9
diff --git a/usr.sbin/fstyp/fstyp.8 b/usr.sbin/fstyp/fstyp.8
index 8471bc207e3c..9ab920073867 100644
--- a/usr.sbin/fstyp/fstyp.8
+++ b/usr.sbin/fstyp/fstyp.8
@@ -112,8 +112,8 @@ utility exits 0 on success, and >0 if an error occurs or the filesystem
 type is not recognized.
 .Sh SEE ALSO
 .Xr file 1 ,
+.Xr autofs 4 ,
 .Xr capsicum 4 ,
-.Xr autofs 5 ,
 .Xr geli 8 ,
 .Xr glabel 8 ,
 .Xr mount 8 ,
diff --git a/usr.sbin/jail/jail.8 b/usr.sbin/jail/jail.8
index d58192623952..407b26df818b 100644
--- a/usr.sbin/jail/jail.8
+++ b/usr.sbin/jail/jail.8
@@ -954,7 +954,7 @@ An
 format file containing filesystems to mount before creating a jail.
 .It Va mount.devfs
 Mount a
-.Xr devfs 5
+.Xr devfs 4
 filesystem on the chrooted
 .Pa /dev
 directory, and apply the ruleset in the
@@ -963,13 +963,13 @@ parameter (or a default of ruleset 4: devfsrules_jail)
 to restrict the devices visible inside the jail.
 .It Va mount.fdescfs
 Mount a
-.Xr fdescfs 5
+.Xr fdescfs 4
 filesystem on the chrooted
 .Pa /dev/fd
 directory.
 .It Va mount.procfs
 Mount a
-.Xr procfs 5
+.Xr procfs 4
 filesystem on the chrooted
 .Pa /proc
 directory.
@@ -1416,13 +1416,13 @@ environment of the first jail.
 .Xr ps 1 ,
 .Xr quota 1 ,
 .Xr jail_set 2 ,
+.Xr devfs 4 ,
+.Xr fdescfs 4 ,
+.Xr linprocfs 4 ,
+.Xr linsysfs 4 ,
+.Xr procfs 4 ,
 .Xr vmm 4 ,
-.Xr devfs 5 ,
-.Xr fdescfs 5 ,
 .Xr jail.conf 5 ,
-.Xr linprocfs 5 ,
-.Xr linsysfs 5 ,
-.Xr procfs 5 ,
 .Xr rc.conf 5 ,
 .Xr sysctl.conf 5 ,
 .Xr bsdconfig 8 ,
diff --git a/usr.sbin/mlx5tool/mlx5tool.8 b/usr.sbin/mlx5tool/mlx5tool.8
index 17f0fd515a50..13c19d2d032b 100644
--- a/usr.sbin/mlx5tool/mlx5tool.8
+++ b/usr.sbin/mlx5tool/mlx5tool.8
@@ -109,7 +109,7 @@ Performs PCIe link-level reset on the specified device.
 .Sh FILES
 The
 .Pa /dev/mlx5ctl
-.Xr devfs 5
+.Xr devfs 4
 node is used to pass commands to the driver.
 .Sh SEE ALSO
 .Xr mlx5en 4 ,
diff --git a/usr.sbin/snapinfo/snapinfo.8 b/usr.sbin/snapinfo/snapinfo.8
index 07e6bf2b4d4a..13c257f74ec5 100644
--- a/usr.sbin/snapinfo/snapinfo.8
+++ b/usr.sbin/snapinfo/snapinfo.8
@@ -53,7 +53,7 @@ Verbose mode.
 Search the file system mounted on this mountpoint.
 .El
 .Sh SEE ALSO
-.Xr ffs 7 ,
+.Xr ffs 4 ,
 .Xr mksnap_ffs 8
 .Sh HISTORY
 The