diff --git a/lib/libarchive/libarchive.3 b/lib/libarchive/libarchive.3
index dbea016d2245..5c8976d06873 100644
--- a/lib/libarchive/libarchive.3
+++ b/lib/libarchive/libarchive.3
@@ -281,7 +281,7 @@ and
 functions can be used to obtain more information.
 .Sh ENVIRONMENT
 There are character set conversions within the
-.Xr archive_entry
+.Xr archive_entry 3
 functions that are impacted by the currently-selected locale.
 .Sh SEE ALSO
 .Xr tar 1 ,
diff --git a/share/man/man4/mac_none.4 b/share/man/man4/mac_none.4
index 50a34af7c9e0..159151e53388 100644
--- a/share/man/man4/mac_none.4
+++ b/share/man/man4/mac_none.4
@@ -62,7 +62,7 @@ The
 policy module implements a sample MAC policy that has no effect on
 access control in the system.
 Unlike
-.Xr 4 mac_stub ,
+.Xr mac_stub 4 ,
 none of the MAC entry points are defined.
 .Ss Label Format
 No labels are defined for
diff --git a/share/man/man4/smb.4 b/share/man/man4/smb.4
index 1c6556bea59e..3aa93ad99183 100644
--- a/share/man/man4/smb.4
+++ b/share/man/man4/smb.4
@@ -174,7 +174,7 @@ and
 system calls are not implemented by this driver.
 .Sh ERRORS
 The
-.Xr ioctl
+.Xr ioctl 2
 commands can cause the following driver-specific errors:
 .Bl -tag -width Er
 .It Bq Er ENXIO
diff --git a/share/man/man7/hier.7 b/share/man/man7/hier.7
index 8790929bf5d9..4ae243749752 100644
--- a/share/man/man7/hier.7
+++ b/share/man/man7/hier.7
@@ -509,7 +509,7 @@ Japanese translations of documents in /usr/share/doc
 .It Pa ncurses/
 HTML documents pertaining to ncurses;
 see
-.Xr ncurses 3X
+.Xr ncurses 3
 .It Pa ntp/
 HTML documents pertaining to the Network Time Protocol
 .It Pa papers/
diff --git a/tools/tools/tinderbox/tbmaster.1 b/tools/tools/tinderbox/tbmaster.1
index 19448fad6add..a48f1c0d417d 100644
--- a/tools/tools/tinderbox/tbmaster.1
+++ b/tools/tools/tinderbox/tbmaster.1
@@ -249,7 +249,7 @@ out.
 No default value.
 .It TINDERBOX
 The location of the
-.Xr tinderbox(1)
+.Xr tinderbox 1
 script.
 The default value is
 .Dq %%HOME%%/bin/tinderbox .