diff --git a/lib/libc/sys/reboot.2 b/lib/libc/sys/reboot.2
index cf347452f910..8f247b2c30e3 100644
--- a/lib/libc/sys/reboot.2
+++ b/lib/libc/sys/reboot.2
@@ -105,7 +105,7 @@ via the
 .Fn reboot
 call.
 See
-.Xr kadb 4
+.Xr ddb 4
 for more information.
 .It Dv RB_NOSYNC
 Normally, the disks are sync'd (see
diff --git a/lib/libdevstat/devstat.3 b/lib/libdevstat/devstat.3
index 319b37e7e985..1f631c0d0fbc 100644
--- a/lib/libdevstat/devstat.3
+++ b/lib/libdevstat/devstat.3
@@ -914,12 +914,12 @@ which is
 .Dv DEVSTAT_ERRBUF_SIZE
 characters long.
 .Sh SEE ALSO
-.Xr sysctl 1 ,
 .Xr systat 1 ,
 .Xr kvm 3 ,
 .Xr sysctl 3 ,
 .Xr iostat 8 ,
 .Xr rpc.rstatd 8 ,
+.Xr sysctl 8 ,
 .Xr vmstat 8 ,
 .Xr devstat 9
 .Sh HISTORY
diff --git a/lib/libtacplus/tacplus.conf.5 b/lib/libtacplus/tacplus.conf.5
index be7af6133807..6f7130f85a2c 100644
--- a/lib/libtacplus/tacplus.conf.5
+++ b/lib/libtacplus/tacplus.conf.5
@@ -36,7 +36,9 @@
 .Nm
 contains the information necessary to configure the TACACS+ client
 library.  It is parsed by
-.Xr tac_config 3 .
+.Fn tac_config
+(see
+.Xr libtacplus 3 ) .
 The file contains one or more lines of text, each describing a
 single TACACS+ server which is to be used by the library.  Leading
 white space is ignored, as are empty lines and lines containing
@@ -89,7 +91,9 @@ order, until a valid response is received or the list is exhausted.
 The standard location for this file is
 .Pa /etc/tacplus.conf .
 An alternate pathname may be specified in the call to
-.Xr tac_config 3 .
+.Fn tac_config
+(see
+.Xr libtacplus 3 ) .
 Since the file contains sensitive information in the form of the
 shared secrets, it should not be readable except by root.
 .Sh FILES
diff --git a/lib/libusb/usb.3 b/lib/libusb/usb.3
index 0b58ea97c032..bf3e9d999318 100644
--- a/lib/libusb/usb.3
+++ b/lib/libusb/usb.3
@@ -203,7 +203,7 @@ The
 specifications can be found at
 .Dv http://www.usb.org/developers/docs.htm .
 .Pp
-.Xr hid 4 ,
+.Xr uhid 4 ,
 .Xr usb 4
 .Sh HISTORY
 The
diff --git a/lib/libusbhid/usb.3 b/lib/libusbhid/usb.3
index 0b58ea97c032..bf3e9d999318 100644
--- a/lib/libusbhid/usb.3
+++ b/lib/libusbhid/usb.3
@@ -203,7 +203,7 @@ The
 specifications can be found at
 .Dv http://www.usb.org/developers/docs.htm .
 .Pp
-.Xr hid 4 ,
+.Xr uhid 4 ,
 .Xr usb 4
 .Sh HISTORY
 The
diff --git a/lib/libusbhid/usbhid.3 b/lib/libusbhid/usbhid.3
index 0b58ea97c032..bf3e9d999318 100644
--- a/lib/libusbhid/usbhid.3
+++ b/lib/libusbhid/usbhid.3
@@ -203,7 +203,7 @@ The
 specifications can be found at
 .Dv http://www.usb.org/developers/docs.htm .
 .Pp
-.Xr hid 4 ,
+.Xr uhid 4 ,
 .Xr usb 4
 .Sh HISTORY
 The
diff --git a/sbin/fsck/fsck.8 b/sbin/fsck/fsck.8
index 4244ad211cdc..205694d63715 100644
--- a/sbin/fsck/fsck.8
+++ b/sbin/fsck/fsck.8
@@ -191,5 +191,5 @@ file system table
 .Sh SEE ALSO
 .Xr fstab 5 ,
 .Xr fsck_ffs 8 ,
-.Xr fsck_msdos 8 ,
+.Xr fsck_msdosfs 8 ,
 .Xr mount 8
diff --git a/share/man/man5/passwd.5 b/share/man/man5/passwd.5
index 46367f7bfa53..204f9d8d7e99 100644
--- a/share/man/man5/passwd.5
+++ b/share/man/man5/passwd.5
@@ -296,11 +296,11 @@ field may also be overridden.
 .Xr login 1 ,
 .Xr passwd 1 ,
 .Xr getpwent 3 ,
+.Xr yp 4 ,
 .Xr netgroup 5 ,
 .Xr adduser 8 ,
 .Xr pwd_mkdb 8 ,
-.Xr vipw 8 ,
-.Xr yp 8
+.Xr vipw 8
 .Pp
 .%T "Managing NFS and NIS"
 (O'Reilly & Associates)
diff --git a/share/man/man5/periodic.conf.5 b/share/man/man5/periodic.conf.5
index 39fc21d56acc..44bff89d8a67 100644
--- a/share/man/man5/periodic.conf.5
+++ b/share/man/man5/periodic.conf.5
@@ -309,7 +309,7 @@ The default is
 .It Va daily_accounting_flags
 .Pq Vt str
 Set to the arguments to pass to the
-.Xr sa 1
+.Xr sa 8
 utility (in addition to
 .Fl s )
 when
diff --git a/share/man/man5/rc.conf.5 b/share/man/man5/rc.conf.5
index 3c142c577500..6b91d41a1d30 100644
--- a/share/man/man5/rc.conf.5
+++ b/share/man/man5/rc.conf.5
@@ -793,7 +793,7 @@ For example, if the
 .Xr amd 8
 maps are stored in NIS, one can set this to
 run
-.Xr ypcat 8
+.Xr ypcat 1
 to get a list of
 .Xr amd 8
 maps from the