diff --git a/share/man/man1/builtin.1 b/share/man/man1/builtin.1
index 72b016b..1eda275 100644
--- a/share/man/man1/builtin.1
+++ b/share/man/man1/builtin.1
@@ -329,4 +329,4 @@ manual page first appeared in
 .Fx 3.4 .
 .Sh AUTHORS
 This manual page was written by
-.An Sheldon Hearn Aq sheldonh@FreeBSD.org .
+.An Sheldon Hearn Aq Mt sheldonh@FreeBSD.org .
diff --git a/share/man/man3/ATOMIC_VAR_INIT.3 b/share/man/man3/ATOMIC_VAR_INIT.3
index e2fc5c0..f6c0a5d 100644
--- a/share/man/man3/ATOMIC_VAR_INIT.3
+++ b/share/man/man3/ATOMIC_VAR_INIT.3
@@ -297,5 +297,5 @@ These macros attempt to conform to
 These macros appeared in
 .Fx 10.0 .
 .Sh AUTHORS
-.An Ed Schouten Aq ed@FreeBSD.org ,
-.An David Chisnall Aq theraven@FreeBSD.org
+.An Ed Schouten Aq Mt ed@FreeBSD.org
+.An David Chisnall Aq Mt theraven@FreeBSD.org
diff --git a/share/man/man3/pthread_affinity_np.3 b/share/man/man3/pthread_affinity_np.3
index 359ce95..5f867f9 100644
--- a/share/man/man3/pthread_affinity_np.3
+++ b/share/man/man3/pthread_affinity_np.3
@@ -148,8 +148,6 @@ The
 and
 .Nm pthread_setaffinity_np
 functions were written by
-.An David Xu
-.Aq davidxu@FreeBSD.org ,
+.An David Xu Aq Mt davidxu@FreeBSD.org ,
 and this manpage was written by
-.An Xin LI
-.Aq delphij@FreeBSD.org .
+.An Xin LI Aq Mt delphij@FreeBSD.org .
diff --git a/share/man/man3/pthread_atfork.3 b/share/man/man3/pthread_atfork.3
index 125bb43..2e783ca 100644
--- a/share/man/man3/pthread_atfork.3
+++ b/share/man/man3/pthread_atfork.3
@@ -113,5 +113,4 @@ function is expected to conform to
 .St -p1003.1 .
 .Sh AUTHORS
 This manpage was written by
-.An Alex Vasylenko
-.Aq lxv@omut.org .
+.An Alex Vasylenko Aq Mt lxv@omut.org .
diff --git a/share/man/man3/pthread_attr_affinity_np.3 b/share/man/man3/pthread_attr_affinity_np.3
index fa1e6bb..ee63e7d7 100644
--- a/share/man/man3/pthread_attr_affinity_np.3
+++ b/share/man/man3/pthread_attr_affinity_np.3
@@ -156,6 +156,6 @@ The
 and
 .Nm pthread_attr_setaffinity_np
 functions were written by
-.An David Xu Aq davidxu@FreeBSD.org ,
+.An David Xu Aq Mt davidxu@FreeBSD.org ,
 and this manpage was written by
-.An Xin LI Aq delphij@FreeBSD.org .
+.An Xin LI Aq Mt delphij@FreeBSD.org .
diff --git a/share/man/man3/pthread_attr_get_np.3 b/share/man/man3/pthread_attr_get_np.3
index 774be8f..e43bcf3 100644
--- a/share/man/man3/pthread_attr_get_np.3
+++ b/share/man/man3/pthread_attr_get_np.3
@@ -112,5 +112,4 @@ thread ID.
 The
 .Fn pthread_attr_get_np
 function and this manual page were written by
-.An Alexey Zelkin
-.Aq phantom@FreeBSD.org .
+.An Alexey Zelkin Aq Mt phantom@FreeBSD.org .
diff --git a/share/man/man3/pthread_attr_setcreatesuspend_np.3 b/share/man/man3/pthread_attr_setcreatesuspend_np.3
index 92c2fe0..75408cc 100644
--- a/share/man/man3/pthread_attr_setcreatesuspend_np.3
+++ b/share/man/man3/pthread_attr_setcreatesuspend_np.3
@@ -69,4 +69,4 @@ is invalid.
 .Xr pthread_resume_np 3
 .Sh AUTHORS
 This manual page was written by
-.An Alexey Zelkin Aq phantom@FreeBSD.org .
+.An Alexey Zelkin Aq Mt phantom@FreeBSD.org .
diff --git a/share/man/man3/pthread_cancel.3 b/share/man/man3/pthread_cancel.3
index 7ac5f9d..e737f5e 100644
--- a/share/man/man3/pthread_cancel.3
+++ b/share/man/man3/pthread_cancel.3
@@ -74,7 +74,7 @@ function conforms to
 .St -p1003.1-96 .
 .Sh AUTHORS
 This manual page was written by
-.An David Leonard Aq d@openbsd.org
+.An David Leonard Aq Mt d@openbsd.org
 for the
 .Ox
 implementation of
diff --git a/share/man/man3/pthread_getcpuclockid.3 b/share/man/man3/pthread_getcpuclockid.3
index 94a99ff..de0e6bc 100644
--- a/share/man/man3/pthread_getcpuclockid.3
+++ b/share/man/man3/pthread_getcpuclockid.3
@@ -81,4 +81,4 @@ The
 function first appeared in
 .Fx 10.0 .
 .Sh AUTHORS
-.An David Xu Aq davidxu@FreeBSD.org
+.An David Xu Aq Mt davidxu@FreeBSD.org
diff --git a/share/man/man3/pthread_getthreadid_np.3 b/share/man/man3/pthread_getthreadid_np.3
index bd28c6b..a912e7d 100644
--- a/share/man/man3/pthread_getthreadid_np.3
+++ b/share/man/man3/pthread_getthreadid_np.3
@@ -53,4 +53,4 @@ None.
 .Xr pthread_self 3
 .Sh AUTHORS
 This manual page was written by
-.An Jung-uk Kim Aq jkim@FreeBSD.org .
+.An Jung-uk Kim Aq Mt jkim@FreeBSD.org .
diff --git a/share/man/man3/pthread_main_np.3 b/share/man/man3/pthread_main_np.3
index 43d7292..81669b7 100644
--- a/share/man/man3/pthread_main_np.3
+++ b/share/man/man3/pthread_main_np.3
@@ -57,4 +57,4 @@ and \-1 if the thread's initialization has not yet completed.
 .Xr pthread_self 3
 .Sh AUTHORS
 This manual page was written by
-.An Alexey Zelkin Aq phantom@FreeBSD.org .
+.An Alexey Zelkin Aq Mt phantom@FreeBSD.org .
diff --git a/share/man/man3/pthread_multi_np.3 b/share/man/man3/pthread_multi_np.3
index 9a42a99..c790d35 100644
--- a/share/man/man3/pthread_multi_np.3
+++ b/share/man/man3/pthread_multi_np.3
@@ -63,4 +63,4 @@ functions always return 0.
 .Xr pthread_suspend_all_np 3
 .Sh AUTHORS
 This manual page was written by
-.An Alexey Zelkin Aq phantom@FreeBSD.org .
+.An Alexey Zelkin Aq Mt phantom@FreeBSD.org .
diff --git a/share/man/man3/pthread_resume_all_np.3 b/share/man/man3/pthread_resume_all_np.3
index 4c63c3b..0ac6736 100644
--- a/share/man/man3/pthread_resume_all_np.3
+++ b/share/man/man3/pthread_resume_all_np.3
@@ -48,4 +48,4 @@ and resumes those which were previously suspended.
 .Xr pthread_suspend_np 3
 .Sh AUTHORS
 This manual page was written by
-.An Alexey Zelkin Aq phantom@FreeBSD.org .
+.An Alexey Zelkin Aq Mt phantom@FreeBSD.org .
diff --git a/share/man/man3/pthread_resume_np.3 b/share/man/man3/pthread_resume_np.3
index 08f7cb9..c8444d2 100644
--- a/share/man/man3/pthread_resume_np.3
+++ b/share/man/man3/pthread_resume_np.3
@@ -69,4 +69,4 @@ argument.
 .Xr pthread_suspend_np 3
 .Sh AUTHORS
 This manual page was written by
-.An Alexey Zelkin Aq phantom@FreeBSD.org .
+.An Alexey Zelkin Aq Mt phantom@FreeBSD.org .
diff --git a/share/man/man3/pthread_set_name_np.3 b/share/man/man3/pthread_set_name_np.3
index aad2fd6..e302939 100644
--- a/share/man/man3/pthread_set_name_np.3
+++ b/share/man/man3/pthread_set_name_np.3
@@ -49,4 +49,4 @@ Because of the debugging nature of this function, all errors that may
 appear inside are silently ignored.
 .Sh AUTHORS
 This manual page was written by
-.An Alexey Zelkin Aq phantom@FreeBSD.org .
+.An Alexey Zelkin Aq Mt phantom@FreeBSD.org .
diff --git a/share/man/man3/pthread_suspend_all_np.3 b/share/man/man3/pthread_suspend_all_np.3
index fdeab19..9daedbf 100644
--- a/share/man/man3/pthread_suspend_all_np.3
+++ b/share/man/man3/pthread_suspend_all_np.3
@@ -50,4 +50,4 @@ function.
 .Xr pthread_suspend_np 3
 .Sh AUTHORS
 This manual page was written by
-.An Alexey Zelkin Aq phantom@FreeBSD.org .
+.An Alexey Zelkin Aq Mt phantom@FreeBSD.org .
diff --git a/share/man/man3/pthread_suspend_np.3 b/share/man/man3/pthread_suspend_np.3
index 43d2b7d..32138a1 100644
--- a/share/man/man3/pthread_suspend_np.3
+++ b/share/man/man3/pthread_suspend_np.3
@@ -67,4 +67,4 @@ argument.
 .Xr pthread_suspend_all_np 3
 .Sh AUTHORS
 This manual page was written by
-.An Alexey Zelkin Aq phantom@FreeBSD.org .
+.An Alexey Zelkin Aq Mt phantom@FreeBSD.org .
diff --git a/share/man/man3/pthread_switch_add_np.3 b/share/man/man3/pthread_switch_add_np.3
index 0c42072..e3400e7 100644
--- a/share/man/man3/pthread_switch_add_np.3
+++ b/share/man/man3/pthread_switch_add_np.3
@@ -84,4 +84,4 @@ function.
 .Xr pthread_create 3
 .Sh AUTHORS
 This manual page was written by
-.An Alexey Zelkin Aq phantom@FreeBSD.org .
+.An Alexey Zelkin Aq Mt phantom@FreeBSD.org .
diff --git a/share/man/man3/pthread_testcancel.3 b/share/man/man3/pthread_testcancel.3
index 007c768..ef6a1c1 100644
--- a/share/man/man3/pthread_testcancel.3
+++ b/share/man/man3/pthread_testcancel.3
@@ -236,7 +236,7 @@ The standard allows implementations to make many more functions
 cancellation points.
 .Sh AUTHORS
 This manual page was written by
-.An David Leonard Aq d@openbsd.org
+.An David Leonard Aq Mt d@openbsd.org
 for the
 .Ox
 implementation of
diff --git a/share/man/man3/siginfo.3 b/share/man/man3/siginfo.3
index 2255766..0d4e594 100644
--- a/share/man/man3/siginfo.3
+++ b/share/man/man3/siginfo.3
@@ -337,4 +337,4 @@ can be generated as of
 .Fx 9.0 .
 .Sh AUTHORS
 This manual page was written by
-.An "David Xu" Aq davidxu@FreeBSD.org .
+.An David Xu Aq Mt davidxu@FreeBSD.org .
diff --git a/share/man/man5/bluetooth.device.conf.5 b/share/man/man5/bluetooth.device.conf.5
index d8abb9e..ea3553b 100644
--- a/share/man/man5/bluetooth.device.conf.5
+++ b/share/man/man5/bluetooth.device.conf.5
@@ -183,4 +183,4 @@ second USB Bluetooth device.
 .Xr hcsecd 8 ,
 .Xr l2control 8
 .Sh AUTHORS
-.An Maksim Yevmenkin Aq m_evmenkin@yahoo.com
+.An Maksim Yevmenkin Aq Mt m_evmenkin@yahoo.com
diff --git a/share/man/man5/bluetooth.hosts.5 b/share/man/man5/bluetooth.hosts.5
index bda4d92..3afa145 100644
--- a/share/man/man5/bluetooth.hosts.5
+++ b/share/man/man5/bluetooth.hosts.5
@@ -60,4 +60,4 @@ delimiter, newline, or comment character.
 .Sh SEE ALSO
 .Xr bluetooth 3
 .Sh AUTHORS
-.An Maksim Yevmenkin Aq m_evmenkin@yahoo.com
+.An Maksim Yevmenkin Aq Mt m_evmenkin@yahoo.com
diff --git a/share/man/man5/bluetooth.protocols.5 b/share/man/man5/bluetooth.protocols.5
index 64a7dd5..2968fa3 100644
--- a/share/man/man5/bluetooth.protocols.5
+++ b/share/man/man5/bluetooth.protocols.5
@@ -59,4 +59,4 @@ character other than a field delimiter, newline, or comment character.
 .Sh SEE ALSO
 .Xr bluetooth 3
 .Sh AUTHORS
-.An Maksim Yevmenkin Aq m_evmenkin@yahoo.com
+.An Maksim Yevmenkin Aq Mt m_evmenkin@yahoo.com
diff --git a/share/man/man5/boot.config.5 b/share/man/man5/boot.config.5
index 681fc3a..f2d7e2d 100644
--- a/share/man/man5/boot.config.5
+++ b/share/man/man5/boot.config.5
@@ -100,4 +100,4 @@ will do both of the above.
 .Xr loader 8
 .Sh AUTHORS
 This manual page was written by
-.An Daniel Gerzo Aq danger@FreeBSD.org .
+.An Daniel Gerzo Aq Mt danger@FreeBSD.org .
diff --git a/share/man/man5/devfs.5 b/share/man/man5/devfs.5
index 5ee1621..073f0a5 100644
--- a/share/man/man5/devfs.5
+++ b/share/man/man5/devfs.5
@@ -145,4 +145,4 @@ manual page first appeared in
 The
 .Nm
 manual page was written by
-.An Mike Pritchard Aq mpp@FreeBSD.org .
+.An Mike Pritchard Aq Mt mpp@FreeBSD.org .
diff --git a/share/man/man5/devfs.conf.5 b/share/man/man5/devfs.conf.5
index 8e53735..834d6e7 100644
--- a/share/man/man5/devfs.conf.5
+++ b/share/man/man5/devfs.conf.5
@@ -135,4 +135,4 @@ perm	cd0	0660
 .Xr chown 8
 .Sh AUTHORS
 This manual page was written by
-.An "Roland Smith" Aq rsmith@xs4all.nl .
+.An Roland Smith Aq Mt rsmith@xs4all.nl .
diff --git a/share/man/man5/devfs.rules.5 b/share/man/man5/devfs.rules.5
index 603189e..b8016db 100644
--- a/share/man/man5/devfs.rules.5
+++ b/share/man/man5/devfs.rules.5
@@ -124,4 +124,4 @@ group, a similar rule may be used:
 .Xr devfs 8
 .Sh AUTHORS
 This manual page was written by
-.An "Roland Smith" Aq rsmith@xs4all.nl .
+.An Roland Smith Aq Mt rsmith@xs4all.nl .
diff --git a/share/man/man5/elf.5 b/share/man/man5/elf.5
index b68363e..a72eed6 100644
--- a/share/man/man5/elf.5
+++ b/share/man/man5/elf.5
@@ -1305,8 +1305,7 @@ ELF in itself first appeared in
 The ELF format is an adopted standard.
 .Sh AUTHORS
 This manual page was written by
-.An Jeroen Ruigrok van der Werven
-.Aq asmodai@FreeBSD.org
+.An Jeroen Ruigrok van der Werven Aq Mt asmodai@FreeBSD.org
 with inspiration from BSDi's
 .Bsx
 .Xr elf 5
diff --git a/share/man/man5/ext2fs.5 b/share/man/man5/ext2fs.5
index 536561b..00be16f 100644
--- a/share/man/man5/ext2fs.5
+++ b/share/man/man5/ext2fs.5
@@ -80,4 +80,4 @@ and others in the
 Project made modifications.
 .Pp
 This manual page was written by
-.An Craig Rodrigues Aq rodrigc@FreeBSD.org .
+.An Craig Rodrigues Aq Mt rodrigc@FreeBSD.org .
diff --git a/share/man/man5/fdescfs.5 b/share/man/man5/fdescfs.5
index f723208..30e72a5 100644
--- a/share/man/man5/fdescfs.5
+++ b/share/man/man5/fdescfs.5
@@ -120,7 +120,7 @@ manual page first appeared in
 The
 .Nm
 manual page was written by
-.An Mike Pritchard Aq mpp@FreeBSD.org ,
+.An Mike Pritchard Aq Mt mpp@FreeBSD.org ,
 and was based on the
 manual page written by
 .An Jan-Simon Pendry .
diff --git a/share/man/man5/freebsd-update.conf.5 b/share/man/man5/freebsd-update.conf.5
index f9f7a56..498fa15 100644
--- a/share/man/man5/freebsd-update.conf.5
+++ b/share/man/man5/freebsd-update.conf.5
@@ -230,4 +230,4 @@ configuration file.
 .Xr sha256 1 ,
 .Xr freebsd-update 8
 .Sh AUTHORS
-.An Colin Percival Aq cperciva@FreeBSD.org
+.An Colin Percival Aq Mt cperciva@FreeBSD.org
diff --git a/share/man/man5/libmap.conf.5 b/share/man/man5/libmap.conf.5
index b97160f..f59bc07 100644
--- a/share/man/man5/libmap.conf.5
+++ b/share/man/man5/libmap.conf.5
@@ -174,7 +174,8 @@ The
 mechanism first appeared in
 .Fx 5.1 .
 .Sh AUTHORS
+.An -nosplit
 This manual page was written by
-.An Matthew N. Dodd Aq winter@jurai.net
+.An Matthew N. Dodd Aq Mt winter@jurai.net
 and extensively rewritten by
-.An Dag-Erling Sm\(/orgrav Aq des@FreeBSD.org .
+.An Dag-Erling Sm\(/orgrav Aq Mt des@FreeBSD.org .
diff --git a/share/man/man5/mailer.conf.5 b/share/man/man5/mailer.conf.5
index 3f48eda..dc55ae7 100644
--- a/share/man/man5/mailer.conf.5
+++ b/share/man/man5/mailer.conf.5
@@ -153,7 +153,7 @@ send-mail	/usr/local/bin/mini_sendmail -srelayhost
 appeared in
 .Nx 1.4 .
 .Sh AUTHORS
-.An Perry E. Metzger Aq perry@piermont.com
+.An Perry E. Metzger Aq Mt perry@piermont.com
 .Sh BUGS
 The entire reason this program exists is a crock.
 Instead, a command
diff --git a/share/man/man5/make.conf.5 b/share/man/man5/make.conf.5
index e33104c..e705749 100644
--- a/share/man/man5/make.conf.5
+++ b/share/man/man5/make.conf.5
@@ -145,7 +145,7 @@ are not supported.
 is provided as a set of
 .Xr cc 1
 settings suggested by
-.An "Bruce Evans" Aq bde@FreeBSD.org
+.An Bruce Evans Aq Mt bde@FreeBSD.org
 for developing and testing changes.
 They can be used, if set, by:
 .Bd -literal -offset indent
@@ -692,7 +692,7 @@ file appeared sometime before
 .Sh AUTHORS
 This
 manual page was written by
-.An Mike W. Meyer Aq mwm@mired.org .
+.An Mike W. Meyer Aq Mt mwm@mired.org .
 .Sh CAVEATS
 Note, that
 .Ev MAKEOBJDIRPREFIX
diff --git a/share/man/man5/mqueuefs.5 b/share/man/man5/mqueuefs.5
index 2431267..dedec10 100644
--- a/share/man/man5/mqueuefs.5
+++ b/share/man/man5/mqueuefs.5
@@ -121,4 +121,4 @@ To see the queue's attributes, just read the file:
 .Xr umount 8
 .Sh AUTHORS
 This manual page was written by
-.An "David Xu" Aq davidxu@FreeBSD.org .
+.An David Xu Aq Mt davidxu@FreeBSD.org .
diff --git a/share/man/man5/msdosfs.5 b/share/man/man5/msdosfs.5
index 70cfe50..ff1df4b 100644
--- a/share/man/man5/msdosfs.5
+++ b/share/man/man5/msdosfs.5
@@ -66,4 +66,4 @@ directory layout.
 .Xr umount 8
 .Sh AUTHORS
 This manual page was written by
-.An Tom Rhodes Aq trhodes@FreeBSD.org .
+.An Tom Rhodes Aq Mt trhodes@FreeBSD.org .
diff --git a/share/man/man5/nandfs.5 b/share/man/man5/nandfs.5
index 2ef3259..9084b89 100644
--- a/share/man/man5/nandfs.5
+++ b/share/man/man5/nandfs.5
@@ -114,15 +114,18 @@ code diverged significantly and is by no means compatible with NILFS.
 .Pp
 The NAND Flash file system first appeared in
 .Fx 10.0 .
-.Sh AUTHOR
+.Sh AUTHORS
+.An -nosplit
 The NAND FS was written by
-.An Grzegorz Bernacki with the help of
+.An Grzegorz Bernacki
+with the help of
 .An Mateusz Guzik ,
 based on the NetBSD code created by
 .An Reinoud Zandijk .
 Additional help and support by
 .An Lukasz Plachno ,
-.An Jan Sieka and
+.An Jan Sieka
+and
 .An Lukasz Wojcik .
 This manual page was written by
 .An Rafal Jaworowski .
diff --git a/share/man/man5/nsmb.conf.5 b/share/man/man5/nsmb.conf.5
index 7e48f60..9f76e78 100644
--- a/share/man/man5/nsmb.conf.5
+++ b/share/man/man5/nsmb.conf.5
@@ -147,6 +147,6 @@ smbutil crypt
 .Sh AUTHORS
 This manual page was written by
 .An -nosplit
-.An Sergey Osokin Aq osa@FreeBSD.org
+.An Sergey Osokin Aq Mt osa@FreeBSD.org
 and
-.An Tom Rhodes Aq trhodes@FreeBSD.org .
+.An Tom Rhodes Aq Mt trhodes@FreeBSD.org .
diff --git a/share/man/man5/nsswitch.conf.5 b/share/man/man5/nsswitch.conf.5
index 80b6cb2..b1fbbd4 100644
--- a/share/man/man5/nsswitch.conf.5
+++ b/share/man/man5/nsswitch.conf.5
@@ -373,8 +373,7 @@ It was imported from the
 Project, where it appeared first in
 .Nx 1.4 .
 .Sh AUTHORS
-Luke Mewburn
-.Aq lukem@netbsd.org
+.An Luke Mewburn Aq Mt lukem@netbsd.org
 wrote this freely distributable name-service switch implementation,
 using ideas from the
 .Tn ULTRIX
diff --git a/share/man/man5/nullfs.5 b/share/man/man5/nullfs.5
index 653711b..3f691e4 100644
--- a/share/man/man5/nullfs.5
+++ b/share/man/man5/nullfs.5
@@ -72,4 +72,4 @@ kernel implementation was written by
 .An John Heideman .
 .Pp
 This manual page was written by
-.An Daniel Gerzo Aq danger@FreeBSD.org .
+.An Daniel Gerzo Aq Mt danger@FreeBSD.org .
diff --git a/share/man/man5/periodic.conf.5 b/share/man/man5/periodic.conf.5
index b4629a8..83897c1 100644
--- a/share/man/man5/periodic.conf.5
+++ b/share/man/man5/periodic.conf.5
@@ -973,4 +973,4 @@ The
 file appeared in
 .Fx 4.1 .
 .Sh AUTHORS
-.An Brian Somers Aq brian@Awfulhak.org
+.An Brian Somers Aq Mt brian@Awfulhak.org
diff --git a/share/man/man5/portindex.5 b/share/man/man5/portindex.5
index a3f856f..c997a25 100644
--- a/share/man/man5/portindex.5
+++ b/share/man/man5/portindex.5
@@ -97,4 +97,4 @@ vim-6.3.15|/usr/ports/editors/vim|/usr/local|Vi "workalike", with many additiona
 This manual page was written by
 .An Paul Armstrong
 and
-.An Thomas Abthorpe Aq tabthorpe@FreeBSD.org .
+.An Thomas Abthorpe Aq Mt tabthorpe@FreeBSD.org .
diff --git a/share/man/man5/portsnap.conf.5 b/share/man/man5/portsnap.conf.5
index 07685b2..f679eda 100644
--- a/share/man/man5/portsnap.conf.5
+++ b/share/man/man5/portsnap.conf.5
@@ -144,4 +144,4 @@ Default location of the portsnap configuration file.
 .Xr portsnap 8 ,
 .Xr sha256 8
 .Sh AUTHORS
-.An Colin Percival Aq cperciva@FreeBSD.org
+.An Colin Percival Aq Mt cperciva@FreeBSD.org
diff --git a/share/man/man5/reiserfs.5 b/share/man/man5/reiserfs.5
index c610f5e..254afb7 100644
--- a/share/man/man5/reiserfs.5
+++ b/share/man/man5/reiserfs.5
@@ -74,10 +74,10 @@ The ReiserFS kernel implementation was written by
 and ported to
 .Fx
 by
-.An Jean-S\['e]bastien P\['e]dron Aq dumbbell@FreeBSD.org .
+.An Jean-S\['e]bastien P\['e]dron Aq Mt dumbbell@FreeBSD.org .
 .Pp
 This manual page was written by
-.An Craig Rodrigues Aq rodrigc@FreeBSD.org .
+.An Craig Rodrigues Aq Mt rodrigc@FreeBSD.org .
 .Sh CAVEATS
 Currently, only read-only access is supported for ReiserFS volumes,
 writing to a volume is not supported.
diff --git a/share/man/man5/tmpfs.5 b/share/man/man5/tmpfs.5
index 78568d2..9cce1fb 100644
--- a/share/man/man5/tmpfs.5
+++ b/share/man/man5/tmpfs.5
@@ -129,7 +129,7 @@ driver first appeared in
 The
 .Nm
 kernel implementation was written by
-.An Julio M. Merino Vidal Aq jmmv@NetBSD.org
+.An Julio M. Merino Vidal Aq Mt jmmv@NetBSD.org
 as a Google SoC project.
 .Pp
 .An Rohit Jalan
@@ -139,6 +139,6 @@ to
 .Fx .
 .Pp
 This manual page was written by
-.An Xin LI Aq delphij@FreeBSD.org .
+.An Xin LI Aq Mt delphij@FreeBSD.org .
 .Sh BUGS
 Some file system mount time options may not be well-supported.
diff --git a/share/man/man7/build.7 b/share/man/man7/build.7
index 0c481db..4b5f6f2 100644
--- a/share/man/man7/build.7
+++ b/share/man/man7/build.7
@@ -630,4 +630,4 @@ make TARGET=sparc64 DESTDIR=/clients/sparc64 installworld
 .Xr reboot 8 ,
 .Xr shutdown 8
 .Sh AUTHORS
-.An Mike W. Meyer Aq mwm@mired.org .
+.An Mike W. Meyer Aq Mt mwm@mired.org
diff --git a/share/man/man7/c99.7 b/share/man/man7/c99.7
index 43ef675..fcf1476 100644
--- a/share/man/man7/c99.7
+++ b/share/man/man7/c99.7
@@ -180,4 +180,4 @@ This manual page first appeared in
 .Fx 9.0 .
 .Sh AUTHORS
 This manual page was originally written by
-.An Gabor Kovesdan Aq gabor@FreeBSD.org .
+.An Gabor Kovesdan Aq Mt gabor@FreeBSD.org .
diff --git a/share/man/man7/development.7 b/share/man/man7/development.7
index 18b9813..65fe008 100644
--- a/share/man/man7/development.7
+++ b/share/man/man7/development.7
@@ -467,14 +467,14 @@ operations you do will be done as
 The
 .Nm
 manual page was originally written by
-.An Matthew Dillon Aq dillon@FreeBSD.org
+.An Matthew Dillon Aq Mt dillon@FreeBSD.org
 and first appeared
 in
 .Fx 5.0 ,
 December 2002.
 It was since extensively modified by
-.An Eitan Adler Aq eadler@FreeBSD.org
+.An Eitan Adler Aq Mt eadler@FreeBSD.org
 to reflect the repository conversion from
-.Xr cvs
+.Xr cvs 1
 to
-.Xr svn .
+.Xr svn 1 .
diff --git a/share/man/man7/release.7 b/share/man/man7/release.7
index f3f897e..8fc75f3 100644
--- a/share/man/man7/release.7
+++ b/share/man/man7/release.7
@@ -636,10 +636,10 @@ and
 .An Poul-Henning Kamp .
 .Pp
 This manual page was originally written by
-.An Murray Stokely Aq murray@FreeBSD.org .
+.An Murray Stokely Aq Mt murray@FreeBSD.org .
 .Pp
 It was updated by
-.An Nathan Whitehorn Aq nwhitehorn@FreeBSD.org
+.An Nathan Whitehorn Aq Mt nwhitehorn@FreeBSD.org
 to include the
 .Fa generate-release.sh
 script used for the
@@ -647,7 +647,7 @@ script used for the
 release cycle.
 .Pp
 It was later updated by
-.An Glen Barber Aq gjb@FreeBSD.org
+.An Glen Barber Aq Mt gjb@FreeBSD.org
 to include the
 .Fa release.sh
 script used for the
diff --git a/share/man/man7/sdoc.7 b/share/man/man7/sdoc.7
index a3c000d..d678c97 100644
--- a/share/man/man7/sdoc.7
+++ b/share/man/man7/sdoc.7
@@ -237,5 +237,7 @@ The
 manual page first appeared in
 .Fx 5.0 .
 .Sh AUTHORS
-.An "Tim Fraser, NAI Labs CBOSS project." Aq tfraser@tislabs.com
-.An "Brian Feldman, NAI Labs CBOSS project." Aq bfeldman@tislabs.com
+.An Tim Fraser Aq Mt tfraser@tislabs.com ,
+NAI Labs CBOSS project
+.An Brian Feldman Aq Mt bfeldman@tislabs.com ,
+NAI Labs CBOSS project
diff --git a/share/man/man7/sprog.7 b/share/man/man7/sprog.7
index cde04b2..f5a2d9c 100644
--- a/share/man/man7/sprog.7
+++ b/share/man/man7/sprog.7
@@ -173,8 +173,8 @@ properly beforehand.
 .Xr strlcpy 3
 .Sh AUTHORS
 .An -nosplit
-.An Eric Melville Aq eric@FreeBSD.org
+.An Eric Melville Aq Mt eric@FreeBSD.org
 originally wrote this document based on a chapter of the
 .%B "FreeBSD Developer's Handbook"
 written by
-.An Murray Stokely Aq murray@FreeBSD.org .
+.An Murray Stokely Aq Mt murray@FreeBSD.org .
diff --git a/share/man/man7/tuning.7 b/share/man/man7/tuning.7
index 5e228dd9..baf0bcc 100644
--- a/share/man/man7/tuning.7
+++ b/share/man/man7/tuning.7
@@ -778,4 +778,4 @@ in
 .Fx 4.3 ,
 May 2001.
 The manual page was greatly modified by
-.An Eitan Adler Aq eadler@FreeBSD.org
+.An Eitan Adler Aq Mt eadler@FreeBSD.org .
diff --git a/share/man/man8/hv_kvp_daemon.8 b/share/man/man8/hv_kvp_daemon.8
index a717153..a095fe8 100644
--- a/share/man/man8/hv_kvp_daemon.8
+++ b/share/man/man8/hv_kvp_daemon.8
@@ -93,4 +93,4 @@ Microsoft Corporation, and Network Appliance Incorporated.
 support for
 .Nm
 was first added by
-.An Microsoft BSD Integration Services Team Aq bsdic@microsoft.com .
+.An Microsoft BSD Integration Services Team Aq Mt bsdic@microsoft.com .
diff --git a/share/man/man8/nanobsd.8 b/share/man/man8/nanobsd.8
index 0309c4e..ef23aa8 100644
--- a/share/man/man8/nanobsd.8
+++ b/share/man/man8/nanobsd.8
@@ -332,6 +332,6 @@ utility first appeared in
 .An -nosplit
 .Nm NanoBSD
 was developed by
-.An Poul-Henning Kamp Aq phk@FreeBSD.org .
+.An Poul-Henning Kamp Aq Mt phk@FreeBSD.org .
 This manual page was written by
-.An Daniel Gerzo Aq danger@FreeBSD.org .
+.An Daniel Gerzo Aq Mt danger@FreeBSD.org .
diff --git a/share/man/man8/picobsd.8 b/share/man/man8/picobsd.8
index e117fe4..4d4daa1 100644
--- a/share/man/man8/picobsd.8
+++ b/share/man/man8/picobsd.8
@@ -650,13 +650,13 @@ already exists on disk (e.g.\& as a result of a previous update).
 .Xr swapon 8
 .Sh AUTHORS
 .An -nosplit
-.An Andrzej Bialecki Aq abial@FreeBSD.org ,
+.An Andrzej Bialecki Aq Mt abial@FreeBSD.org ,
 with subsequent work on the scripts by
-.An Luigi Rizzo Aq luigi@iet.unipi.it
+.An Luigi Rizzo Aq Mt luigi@iet.unipi.it
 and others.
 Man page and
 .Pa Makefiles
 created by
-.An Greg Lehey Aq grog@lemis.com .
+.An Greg Lehey Aq Mt grog@lemis.com .
 .Sh BUGS
 Documentation is still incomplete.
diff --git a/share/man/man8/rescue.8 b/share/man/man8/rescue.8
index 2921887..299bdfc 100644
--- a/share/man/man8/rescue.8
+++ b/share/man/man8/rescue.8
@@ -145,13 +145,13 @@ utilities first appeared in
 The
 .Nm
 system was written by
-.An Tim Kientzle Aq kientzle@FreeBSD.org ,
+.An Tim Kientzle Aq Mt kientzle@FreeBSD.org ,
 based on ideas taken from
 .Nx .
 This manual page was written by
-.An Simon L. Nielsen Aq simon@FreeBSD.org ,
+.An Simon L. Nielsen Aq Mt simon@FreeBSD.org ,
 based on text by
-.An Tim Kientzle Aq kientzle@FreeBSD.org .
+.An Tim Kientzle Aq Mt kientzle@FreeBSD.org .
 .Sh BUGS
 Most of the
 .Nm