diff --git a/lib/libc/capability/cap_rights_init.3 b/lib/libc/capability/cap_rights_init.3
index 464184eaea6..5615de1a680 100644
--- a/lib/libc/capability/cap_rights_init.3
+++ b/lib/libc/capability/cap_rights_init.3
@@ -237,5 +237,5 @@ Support for capabilities and capabilities mode was developed as part of the
 Project.
 .Sh AUTHORS
 This family of functions was created by
-.An Pawel Jakub Dawidek Aq pawel@dawidek.net
+.An Pawel Jakub Dawidek Aq Mt pawel@dawidek.net
 under sponsorship from the FreeBSD Foundation.
diff --git a/lib/libc/gen/cap_rights_get.3 b/lib/libc/gen/cap_rights_get.3
index bc6fb248ec2..f74d1f7aeda 100644
--- a/lib/libc/gen/cap_rights_get.3
+++ b/lib/libc/gen/cap_rights_get.3
@@ -115,5 +115,5 @@ Support for capabilities and capabilities mode was developed as part of the
 Project.
 .Sh AUTHORS
 This function was created by
-.An Pawel Jakub Dawidek Aq pawel@dawidek.net
+.An Pawel Jakub Dawidek Aq Mt pawel@dawidek.net
 under sponsorship of the FreeBSD Foundation.
diff --git a/lib/libc/gen/cap_sandboxed.3 b/lib/libc/gen/cap_sandboxed.3
index 7019bfb9a3f..5882ff00278 100644
--- a/lib/libc/gen/cap_sandboxed.3
+++ b/lib/libc/gen/cap_sandboxed.3
@@ -67,5 +67,5 @@ or
 .Xr capsicum 4
 .Sh AUTHORS
 This function was implemented and manual page was written by
-.An Pawel Jakub Dawidek Aq pawel@dawidek.net
+.An Pawel Jakub Dawidek Aq Mt pawel@dawidek.net
 under sponsorship of the FreeBSD Foundation.
diff --git a/lib/libc/gen/check_utility_compat.3 b/lib/libc/gen/check_utility_compat.3
index 57638e50ead..89449a4064b 100644
--- a/lib/libc/gen/check_utility_compat.3
+++ b/lib/libc/gen/check_utility_compat.3
@@ -86,4 +86,4 @@ function first appeared in
 .Fx 5.0 .
 .Sh AUTHORS
 This manual page was written by
-.An Garrett Wollman Aq wollman@FreeBSD.org .
+.An Garrett Wollman Aq Mt wollman@FreeBSD.org .
diff --git a/lib/libc/gen/clock_getcpuclockid.3 b/lib/libc/gen/clock_getcpuclockid.3
index 3d31993ccc2..ebaa3dc0cc4 100644
--- a/lib/libc/gen/clock_getcpuclockid.3
+++ b/lib/libc/gen/clock_getcpuclockid.3
@@ -92,4 +92,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/lib/libc/gen/dlinfo.3 b/lib/libc/gen/dlinfo.3
index d00f07467af..3fc568e0fcc 100644
--- a/lib/libc/gen/dlinfo.3
+++ b/lib/libc/gen/dlinfo.3
@@ -271,12 +271,9 @@ The
 implementation of the
 .Fn dlinfo
 function was originally written by
-.An Alexey Zelkin
-.Aq phantom@FreeBSD.org
+.An Alexey Zelkin Aq Mt phantom@FreeBSD.org
 and later extended and improved by
-.An Alexander Kabaev
-.Aq kan@FreeBSD.org .
+.An Alexander Kabaev Aq Mt kan@FreeBSD.org .
 .Pp
 The manual page for this function was written by
-.An Alexey Zelkin
-.Aq phantom@FreeBSD.org .
+.An Alexey Zelkin Aq Mt phantom@FreeBSD.org .
diff --git a/lib/libc/gen/ftok.3 b/lib/libc/gen/ftok.3
index 996b2da41c7..98f8bad878f 100644
--- a/lib/libc/gen/ftok.3
+++ b/lib/libc/gen/ftok.3
@@ -73,7 +73,7 @@ The
 function originates with System V and is typically used by programs
 that use the System V IPC routines.
 .Sh AUTHORS
-.An Thorsten Lockert Aq tholo@sigmasoft.com
+.An Thorsten Lockert Aq Mt tholo@sigmasoft.com
 .Sh BUGS
 The returned key is computed based on the device minor number and inode of the
 specified
diff --git a/lib/libc/gen/getpagesizes.3 b/lib/libc/gen/getpagesizes.3
index 854e2f7858f..52fa866821f 100644
--- a/lib/libc/gen/getpagesizes.3
+++ b/lib/libc/gen/getpagesizes.3
@@ -96,4 +96,4 @@ implementation that was first released in
 .Fx 7.3 .
 .Sh AUTHORS
 This manual page was written by
-.An Alan L. Cox Aq alc@cs.rice.edu .
+.An Alan L. Cox Aq Mt alc@cs.rice.edu .
diff --git a/lib/libc/gen/getutxent.3 b/lib/libc/gen/getutxent.3
index 2ea09712d8d..120f4a08b8e 100644
--- a/lib/libc/gen/getutxent.3
+++ b/lib/libc/gen/getutxent.3
@@ -475,4 +475,4 @@ They replaced the
 .In utmp.h
 interface.
 .Sh AUTHORS
-.An Ed Schouten Aq ed@FreeBSD.org
+.An Ed Schouten Aq Mt ed@FreeBSD.org
diff --git a/lib/libc/gen/posix_spawn.3 b/lib/libc/gen/posix_spawn.3
index 73359b44b16..dd5bd2b5ed8 100644
--- a/lib/libc/gen/posix_spawn.3
+++ b/lib/libc/gen/posix_spawn.3
@@ -457,4 +457,4 @@ and
 functions first appeared in
 .Fx 8.0 .
 .Sh AUTHORS
-.An Ed Schouten Aq ed@FreeBSD.org
+.An Ed Schouten Aq Mt ed@FreeBSD.org
diff --git a/lib/libc/gen/posix_spawn_file_actions_addopen.3 b/lib/libc/gen/posix_spawn_file_actions_addopen.3
index 9cd47efb02d..b28f3960ef6 100644
--- a/lib/libc/gen/posix_spawn_file_actions_addopen.3
+++ b/lib/libc/gen/posix_spawn_file_actions_addopen.3
@@ -200,4 +200,4 @@ and
 functions first appeared in
 .Fx 8.0 .
 .Sh AUTHORS
-.An Ed Schouten Aq ed@FreeBSD.org
+.An Ed Schouten Aq Mt ed@FreeBSD.org
diff --git a/lib/libc/gen/posix_spawn_file_actions_init.3 b/lib/libc/gen/posix_spawn_file_actions_init.3
index d826b8bf445..eda2a1daa1e 100644
--- a/lib/libc/gen/posix_spawn_file_actions_init.3
+++ b/lib/libc/gen/posix_spawn_file_actions_init.3
@@ -101,4 +101,4 @@ and
 functions first appeared in
 .Fx 8.0 .
 .Sh AUTHORS
-.An Ed Schouten Aq ed@FreeBSD.org
+.An Ed Schouten Aq Mt ed@FreeBSD.org
diff --git a/lib/libc/gen/posix_spawnattr_getflags.3 b/lib/libc/gen/posix_spawnattr_getflags.3
index 4064011f1d0..b5995cea4a8 100644
--- a/lib/libc/gen/posix_spawnattr_getflags.3
+++ b/lib/libc/gen/posix_spawnattr_getflags.3
@@ -108,4 +108,4 @@ and
 functions first appeared in
 .Fx 8.0 .
 .Sh AUTHORS
-.An Ed Schouten Aq ed@FreeBSD.org
+.An Ed Schouten Aq Mt ed@FreeBSD.org
diff --git a/lib/libc/gen/posix_spawnattr_getpgroup.3 b/lib/libc/gen/posix_spawnattr_getpgroup.3
index 5cd51d687ab..91b3e5cd3d1 100644
--- a/lib/libc/gen/posix_spawnattr_getpgroup.3
+++ b/lib/libc/gen/posix_spawnattr_getpgroup.3
@@ -93,4 +93,4 @@ and
 functions first appeared in
 .Fx 8.0 .
 .Sh AUTHORS
-.An Ed Schouten Aq ed@FreeBSD.org
+.An Ed Schouten Aq Mt ed@FreeBSD.org
diff --git a/lib/libc/gen/posix_spawnattr_getschedparam.3 b/lib/libc/gen/posix_spawnattr_getschedparam.3
index 70009b9b409..a137200bd6a 100644
--- a/lib/libc/gen/posix_spawnattr_getschedparam.3
+++ b/lib/libc/gen/posix_spawnattr_getschedparam.3
@@ -97,4 +97,4 @@ and
 functions first appeared in
 .Fx 8.0 .
 .Sh AUTHORS
-.An Ed Schouten Aq ed@FreeBSD.org
+.An Ed Schouten Aq Mt ed@FreeBSD.org
diff --git a/lib/libc/gen/posix_spawnattr_getschedpolicy.3 b/lib/libc/gen/posix_spawnattr_getschedpolicy.3
index 45c1965408b..3e79d4b7958 100644
--- a/lib/libc/gen/posix_spawnattr_getschedpolicy.3
+++ b/lib/libc/gen/posix_spawnattr_getschedpolicy.3
@@ -95,4 +95,4 @@ and
 functions first appeared in
 .Fx 8.0 .
 .Sh AUTHORS
-.An Ed Schouten Aq ed@FreeBSD.org
+.An Ed Schouten Aq Mt ed@FreeBSD.org
diff --git a/lib/libc/gen/posix_spawnattr_getsigdefault.3 b/lib/libc/gen/posix_spawnattr_getsigdefault.3
index 9e13c3742cf..88783322ff9 100644
--- a/lib/libc/gen/posix_spawnattr_getsigdefault.3
+++ b/lib/libc/gen/posix_spawnattr_getsigdefault.3
@@ -95,4 +95,4 @@ and
 functions first appeared in
 .Fx 8.0 .
 .Sh AUTHORS
-.An Ed Schouten Aq ed@FreeBSD.org
+.An Ed Schouten Aq Mt ed@FreeBSD.org
diff --git a/lib/libc/gen/posix_spawnattr_getsigmask.3 b/lib/libc/gen/posix_spawnattr_getsigmask.3
index 5cee7ec6853..4f9c014853a 100644
--- a/lib/libc/gen/posix_spawnattr_getsigmask.3
+++ b/lib/libc/gen/posix_spawnattr_getsigmask.3
@@ -95,4 +95,4 @@ and
 functions first appeared in
 .Fx 8.0 .
 .Sh AUTHORS
-.An Ed Schouten Aq ed@FreeBSD.org
+.An Ed Schouten Aq Mt ed@FreeBSD.org
diff --git a/lib/libc/gen/posix_spawnattr_init.3 b/lib/libc/gen/posix_spawnattr_init.3
index 66c99cd5afa..19d29a6f99c 100644
--- a/lib/libc/gen/posix_spawnattr_init.3
+++ b/lib/libc/gen/posix_spawnattr_init.3
@@ -120,4 +120,4 @@ and
 functions first appeared in
 .Fx 8.0 .
 .Sh AUTHORS
-.An Ed Schouten Aq ed@FreeBSD.org
+.An Ed Schouten Aq Mt ed@FreeBSD.org
diff --git a/lib/libc/gen/setproctitle.3 b/lib/libc/gen/setproctitle.3
index 0fefddf3b31..955556e5b20 100644
--- a/lib/libc/gen/setproctitle.3
+++ b/lib/libc/gen/setproctitle.3
@@ -100,11 +100,11 @@ Other operating systems have
 similar functions.
 .Sh AUTHORS
 .An -nosplit
-.An Peter Wemm Aq peter@FreeBSD.org
+.An Peter Wemm Aq Mt peter@FreeBSD.org
 stole the idea from the
 .Sy "Sendmail 8.7.3"
 source code by
-.An Eric Allman Aq eric@sendmail.org .
+.An Eric Allman Aq Mt eric@sendmail.org .
 .Sh BUGS
 Never pass a string with user-supplied data as a format without using
 .Ql %s .
diff --git a/lib/libc/gen/statvfs.3 b/lib/libc/gen/statvfs.3
index f9c7430f6e9..73109bd9834 100644
--- a/lib/libc/gen/statvfs.3
+++ b/lib/libc/gen/statvfs.3
@@ -184,4 +184,4 @@ The
 and
 .Fn fstatvfs
 functions and this manual page were written by
-.An Garrett Wollman Aq wollman@FreeBSD.org .
+.An Garrett Wollman Aq Mt wollman@FreeBSD.org .
diff --git a/lib/libc/iconv/__iconv_get_list.3 b/lib/libc/iconv/__iconv_get_list.3
index 4db88d8faa6..076f4d5b6a1 100644
--- a/lib/libc/iconv/__iconv_get_list.3
+++ b/lib/libc/iconv/__iconv_get_list.3
@@ -92,4 +92,4 @@ The iconv implementation of the Citrus Project was adopted in
 .Fx 9.0 .
 .Sh AUTHORS
 This manual page was written by
-.An Gabor Kovesdan Aq gabor@FreeBSD.org .
+.An Gabor Kovesdan Aq Mt gabor@FreeBSD.org .
diff --git a/lib/libc/iconv/iconv_canonicalize.3 b/lib/libc/iconv/iconv_canonicalize.3
index a5d3e771662..d98235aabbf 100644
--- a/lib/libc/iconv/iconv_canonicalize.3
+++ b/lib/libc/iconv/iconv_canonicalize.3
@@ -71,4 +71,4 @@ the GNU implementation and was adopted in
 for compatibility's sake.
 .Sh AUTHORS
 This manual page was written by
-.An Gabor Kovesdan Aq gabor@FreeBSD.org .
+.An Gabor Kovesdan Aq Mt gabor@FreeBSD.org .
diff --git a/lib/libc/iconv/iconvctl.3 b/lib/libc/iconv/iconvctl.3
index 5728ad3ee5e..d6bc67f9b98 100644
--- a/lib/libc/iconv/iconvctl.3
+++ b/lib/libc/iconv/iconvctl.3
@@ -179,7 +179,7 @@ the GNU implementation and was adopted in
 for compatibility's sake.
 .Sh AUTHORS
 This manual page was written by
-.An Gabor Kovesdan Aq gabor@FreeBSD.org .
+.An Gabor Kovesdan Aq Mt gabor@FreeBSD.org .
 .Sh BUGS
 Transliteration is enabled in this implementation by default, so it
 is impossible by design to turn it off.
diff --git a/lib/libc/iconv/iconvlist.3 b/lib/libc/iconv/iconvlist.3
index ff9ea6b3f0f..bef609b3136 100644
--- a/lib/libc/iconv/iconvlist.3
+++ b/lib/libc/iconv/iconvlist.3
@@ -90,4 +90,4 @@ the GNU implementation and was adopted in
 for compatibility's sake.
 .Sh AUTHORS
 This manual page was written by
-.An Gabor Kovesdan Aq gabor@FreeBSD.org .
+.An Gabor Kovesdan Aq Mt gabor@FreeBSD.org .
diff --git a/lib/libc/net/nsdispatch.3 b/lib/libc/net/nsdispatch.3
index 577bce98e45..e08e9bef7ca 100644
--- a/lib/libc/net/nsdispatch.3
+++ b/lib/libc/net/nsdispatch.3
@@ -239,8 +239,7 @@ where it appeared first in
 Support for NSS modules first appeared in
 .Fx 5.1 .
 .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/lib/libc/net/sourcefilter.3 b/lib/libc/net/sourcefilter.3
index 225b0209bd9..a123ff38d68 100644
--- a/lib/libc/net/sourcefilter.3
+++ b/lib/libc/net/sourcefilter.3
@@ -236,5 +236,4 @@ The
 functions first appeared in
 .Fx 7.0 .
 .Sh AUTHORS
-Bruce M. Simpson
-.Aq bms@FreeBSD.org
+.An Bruce M. Simpson Aq Mt bms@FreeBSD.org
diff --git a/lib/libc/posix1e/acl_add_flag_np.3 b/lib/libc/posix1e/acl_add_flag_np.3
index 057de0393ca..9f7b21e0937 100644
--- a/lib/libc/posix1e/acl_add_flag_np.3
+++ b/lib/libc/posix1e/acl_add_flag_np.3
@@ -94,4 +94,4 @@ function was added in
 The
 .Fn acl_add_flag_np
 function was written by
-.An Edward Tomasz Napierala Aq trasz@FreeBSD.org .
+.An Edward Tomasz Napierala Aq Mt trasz@FreeBSD.org .
diff --git a/lib/libc/posix1e/acl_add_perm.3 b/lib/libc/posix1e/acl_add_perm.3
index 564b83d9a33..c59aac8e41f 100644
--- a/lib/libc/posix1e/acl_add_perm.3
+++ b/lib/libc/posix1e/acl_add_perm.3
@@ -126,4 +126,4 @@ function was added in
 The
 .Fn acl_add_perm
 function was written by
-.An Chris D. Faulhaber Aq jedgar@fxp.org .
+.An Chris D. Faulhaber Aq Mt jedgar@fxp.org .
diff --git a/lib/libc/posix1e/acl_calc_mask.3 b/lib/libc/posix1e/acl_calc_mask.3
index 7bcdb4082e2..1cd3fd7c03c 100644
--- a/lib/libc/posix1e/acl_calc_mask.3
+++ b/lib/libc/posix1e/acl_calc_mask.3
@@ -95,4 +95,4 @@ function was added in
 The
 .Fn acl_calc_mask
 function was written by
-.An Chris D. Faulhaber Aq jedgar@fxp.org .
+.An Chris D. Faulhaber Aq Mt jedgar@fxp.org .
diff --git a/lib/libc/posix1e/acl_clear_flags_np.3 b/lib/libc/posix1e/acl_clear_flags_np.3
index 0780e149d5f..a3da4815371 100644
--- a/lib/libc/posix1e/acl_clear_flags_np.3
+++ b/lib/libc/posix1e/acl_clear_flags_np.3
@@ -76,4 +76,4 @@ function was added in
 The
 .Fn acl_clear_flags_np
 function was written by
-.An Edward Tomasz Napierala Aq trasz@FreeBSD.org .
+.An Edward Tomasz Napierala Aq Mt trasz@FreeBSD.org .
diff --git a/lib/libc/posix1e/acl_clear_perms.3 b/lib/libc/posix1e/acl_clear_perms.3
index df82b6c7869..4b055fcf5e6 100644
--- a/lib/libc/posix1e/acl_clear_perms.3
+++ b/lib/libc/posix1e/acl_clear_perms.3
@@ -76,4 +76,4 @@ function was added in
 The
 .Fn acl_clear_perms
 function was written by
-.An Chris D. Faulhaber Aq jedgar@fxp.org .
+.An Chris D. Faulhaber Aq Mt jedgar@fxp.org .
diff --git a/lib/libc/posix1e/acl_copy_entry.3 b/lib/libc/posix1e/acl_copy_entry.3
index 586b8227176..5fd31ed793e 100644
--- a/lib/libc/posix1e/acl_copy_entry.3
+++ b/lib/libc/posix1e/acl_copy_entry.3
@@ -82,4 +82,4 @@ function was added in
 The
 .Fn acl_copy_entry
 function was written by
-.An Chris D. Faulhaber Aq jedgar@fxp.org .
+.An Chris D. Faulhaber Aq Mt jedgar@fxp.org .
diff --git a/lib/libc/posix1e/acl_create_entry.3 b/lib/libc/posix1e/acl_create_entry.3
index 784f6875cf9..76c14f3f0e9 100644
--- a/lib/libc/posix1e/acl_create_entry.3
+++ b/lib/libc/posix1e/acl_create_entry.3
@@ -95,4 +95,4 @@ function was added in
 The
 .Fn acl_create_entry
 function was written by
-.An Chris D. Faulhaber Aq jedgar@fxp.org .
+.An Chris D. Faulhaber Aq Mt jedgar@fxp.org .
diff --git a/lib/libc/posix1e/acl_delete_entry.3 b/lib/libc/posix1e/acl_delete_entry.3
index b1bdc5ac74b..06bb0ded1ed 100644
--- a/lib/libc/posix1e/acl_delete_entry.3
+++ b/lib/libc/posix1e/acl_delete_entry.3
@@ -98,4 +98,4 @@ function was added in
 The
 .Fn acl_delete_entry
 function was written by
-.An Chris D. Faulhaber Aq jedgar@fxp.org .
+.An Chris D. Faulhaber Aq Mt jedgar@fxp.org .
diff --git a/lib/libc/posix1e/acl_delete_flag_np.3 b/lib/libc/posix1e/acl_delete_flag_np.3
index a288978b8a3..ba7a738394f 100644
--- a/lib/libc/posix1e/acl_delete_flag_np.3
+++ b/lib/libc/posix1e/acl_delete_flag_np.3
@@ -81,4 +81,4 @@ function was added in
 The
 .Fn acl_delete_flag_np
 function was written by
-.An Edward Tomasz Napierala Aq trasz@FreeBSD.org .
+.An Edward Tomasz Napierala Aq Mt trasz@FreeBSD.org .
diff --git a/lib/libc/posix1e/acl_delete_perm.3 b/lib/libc/posix1e/acl_delete_perm.3
index b6c725058b4..90f244e147c 100644
--- a/lib/libc/posix1e/acl_delete_perm.3
+++ b/lib/libc/posix1e/acl_delete_perm.3
@@ -81,4 +81,4 @@ function was added in
 The
 .Fn acl_delete_perm
 function was written by
-.An Chris D. Faulhaber Aq jedgar@fxp.org .
+.An Chris D. Faulhaber Aq Mt jedgar@fxp.org .
diff --git a/lib/libc/posix1e/acl_get_brand_np.3 b/lib/libc/posix1e/acl_get_brand_np.3
index 5caa40c862a..44b83e23293 100644
--- a/lib/libc/posix1e/acl_get_brand_np.3
+++ b/lib/libc/posix1e/acl_get_brand_np.3
@@ -83,4 +83,4 @@ function was added in
 The
 .Fn acl_get_brand_np
 function was written by
-.An Edward Tomasz Napierala Aq trasz@FreeBSD.org .
+.An Edward Tomasz Napierala Aq Mt trasz@FreeBSD.org .
diff --git a/lib/libc/posix1e/acl_get_entry.3 b/lib/libc/posix1e/acl_get_entry.3
index 477b735edfb..88c72db2559 100644
--- a/lib/libc/posix1e/acl_get_entry.3
+++ b/lib/libc/posix1e/acl_get_entry.3
@@ -142,4 +142,4 @@ function was added in
 The
 .Fn acl_get_entry
 function was written by
-.An Chris D. Faulhaber Aq jedgar@fxp.org .
+.An Chris D. Faulhaber Aq Mt jedgar@fxp.org .
diff --git a/lib/libc/posix1e/acl_get_entry_type_np.3 b/lib/libc/posix1e/acl_get_entry_type_np.3
index eea4b17425c..6313d0607c7 100644
--- a/lib/libc/posix1e/acl_get_entry_type_np.3
+++ b/lib/libc/posix1e/acl_get_entry_type_np.3
@@ -77,4 +77,4 @@ function was added in
 The
 .Fn acl_get_entry_type_np
 function was written by
-.An Edward Tomasz Napierala Aq trasz@FreeBSD.org .
+.An Edward Tomasz Napierala Aq Mt trasz@FreeBSD.org .
diff --git a/lib/libc/posix1e/acl_get_flag_np.3 b/lib/libc/posix1e/acl_get_flag_np.3
index b57fd04bc60..d70ce84427d 100644
--- a/lib/libc/posix1e/acl_get_flag_np.3
+++ b/lib/libc/posix1e/acl_get_flag_np.3
@@ -91,4 +91,4 @@ function was added in
 The
 .Fn acl_get_flag_np
 function was written by
-.An Edward Tomasz Napierala Aq trasz@FreeBSD.org .
+.An Edward Tomasz Napierala Aq Mt trasz@FreeBSD.org .
diff --git a/lib/libc/posix1e/acl_get_flagset_np.3 b/lib/libc/posix1e/acl_get_flagset_np.3
index 221b93bce91..fd1c8b2aed3 100644
--- a/lib/libc/posix1e/acl_get_flagset_np.3
+++ b/lib/libc/posix1e/acl_get_flagset_np.3
@@ -80,4 +80,4 @@ function was added in
 The
 .Fn acl_get_flagset_np
 function was written by
-.An Edward Tomasz Napierala Aq trasz@FreeBSD.org .
+.An Edward Tomasz Napierala Aq Mt trasz@FreeBSD.org .
diff --git a/lib/libc/posix1e/acl_get_perm_np.3 b/lib/libc/posix1e/acl_get_perm_np.3
index de1c0b5f9dc..0f4126ecbe6 100644
--- a/lib/libc/posix1e/acl_get_perm_np.3
+++ b/lib/libc/posix1e/acl_get_perm_np.3
@@ -91,4 +91,4 @@ function was added in
 The
 .Fn acl_get_perm_np
 function was written by
-.An Chris D. Faulhaber Aq jedgar@fxp.org .
+.An Chris D. Faulhaber Aq Mt jedgar@fxp.org .
diff --git a/lib/libc/posix1e/acl_get_permset.3 b/lib/libc/posix1e/acl_get_permset.3
index cf93b0a8d3f..064f71ce45b 100644
--- a/lib/libc/posix1e/acl_get_permset.3
+++ b/lib/libc/posix1e/acl_get_permset.3
@@ -80,4 +80,4 @@ function was added in
 The
 .Fn acl_get_permset
 function was written by
-.An Chris D. Faulhaber Aq jedgar@fxp.org .
+.An Chris D. Faulhaber Aq Mt jedgar@fxp.org .
diff --git a/lib/libc/posix1e/acl_get_qualifier.3 b/lib/libc/posix1e/acl_get_qualifier.3
index 653a3b4f327..fcafd2cc3bb 100644
--- a/lib/libc/posix1e/acl_get_qualifier.3
+++ b/lib/libc/posix1e/acl_get_qualifier.3
@@ -137,4 +137,4 @@ function was added in
 The
 .Fn acl_get_qualifier
 function was written by
-.An Chris D. Faulhaber Aq jedgar@fxp.org .
+.An Chris D. Faulhaber Aq Mt jedgar@fxp.org .
diff --git a/lib/libc/posix1e/acl_get_tag_type.3 b/lib/libc/posix1e/acl_get_tag_type.3
index 4856c508277..64c57efed73 100644
--- a/lib/libc/posix1e/acl_get_tag_type.3
+++ b/lib/libc/posix1e/acl_get_tag_type.3
@@ -82,4 +82,4 @@ function was added in
 The
 .Fn acl_get_tag_type
 function was written by
-.An Chris D. Faulhaber Aq jedgar@fxp.org .
+.An Chris D. Faulhaber Aq Mt jedgar@fxp.org .
diff --git a/lib/libc/posix1e/acl_is_trivial_np.3 b/lib/libc/posix1e/acl_is_trivial_np.3
index 4f5a22cd6dd..142a76c8f1a 100644
--- a/lib/libc/posix1e/acl_is_trivial_np.3
+++ b/lib/libc/posix1e/acl_is_trivial_np.3
@@ -82,4 +82,4 @@ The
 function was added in
 .Fx 8.0 .
 .Sh AUTHORS
-.An Edward Tomasz Napierala Aq trasz@FreeBSD.org .
+.An Edward Tomasz Napierala Aq Mt trasz@FreeBSD.org
diff --git a/lib/libc/posix1e/acl_set_entry_type_np.3 b/lib/libc/posix1e/acl_set_entry_type_np.3
index 648775d4e83..2257b53c371 100644
--- a/lib/libc/posix1e/acl_set_entry_type_np.3
+++ b/lib/libc/posix1e/acl_set_entry_type_np.3
@@ -91,4 +91,4 @@ function was added in
 The
 .Fn acl_get_entry_type_np
 function was written by
-.An Edward Tomasz Napierala Aq trasz@FreeBSD.org .
+.An Edward Tomasz Napierala Aq Mt trasz@FreeBSD.org .
diff --git a/lib/libc/posix1e/acl_set_flagset_np.3 b/lib/libc/posix1e/acl_set_flagset_np.3
index 386665d4b4c..3d271c86839 100644
--- a/lib/libc/posix1e/acl_set_flagset_np.3
+++ b/lib/libc/posix1e/acl_set_flagset_np.3
@@ -82,4 +82,4 @@ function was added in
 The
 .Fn acl_set_flagset_np
 function was written by
-.An Edward Tomasz Napierala Aq trasz@FreeBSD.org .
+.An Edward Tomasz Napierala Aq Mt trasz@FreeBSD.org .
diff --git a/lib/libc/posix1e/acl_set_permset.3 b/lib/libc/posix1e/acl_set_permset.3
index 0cf658161b8..259aef6b845 100644
--- a/lib/libc/posix1e/acl_set_permset.3
+++ b/lib/libc/posix1e/acl_set_permset.3
@@ -78,4 +78,4 @@ function was added in
 The
 .Fn acl_set_permset
 function was written by
-.An Chris D. Faulhaber Aq jedgar@fxp.org .
+.An Chris D. Faulhaber Aq Mt jedgar@fxp.org .
diff --git a/lib/libc/posix1e/acl_set_qualifier.3 b/lib/libc/posix1e/acl_set_qualifier.3
index 47a60d81121..26542ce2838 100644
--- a/lib/libc/posix1e/acl_set_qualifier.3
+++ b/lib/libc/posix1e/acl_set_qualifier.3
@@ -88,4 +88,4 @@ function was added in
 The
 .Fn acl_get_qualifier
 function was written by
-.An Chris D. Faulhaber Aq jedgar@fxp.org .
+.An Chris D. Faulhaber Aq Mt jedgar@fxp.org .
diff --git a/lib/libc/posix1e/acl_set_tag_type.3 b/lib/libc/posix1e/acl_set_tag_type.3
index 79526a00445..42834c2657d 100644
--- a/lib/libc/posix1e/acl_set_tag_type.3
+++ b/lib/libc/posix1e/acl_set_tag_type.3
@@ -99,4 +99,4 @@ function was added in
 The
 .Fn acl_set_tag_type
 function was written by
-.An Chris D. Faulhaber Aq jedgar@fxp.org .
+.An Chris D. Faulhaber Aq Mt jedgar@fxp.org .
diff --git a/lib/libc/posix1e/acl_strip_np.3 b/lib/libc/posix1e/acl_strip_np.3
index cc6c65b70fd..8c1a920a717 100644
--- a/lib/libc/posix1e/acl_strip_np.3
+++ b/lib/libc/posix1e/acl_strip_np.3
@@ -106,4 +106,4 @@ The
 function was added in
 .Fx 8.0 .
 .Sh AUTHORS
-.An Edward Tomasz Napierala Aq trasz@FreeBSD.org .
+.An Edward Tomasz Napierala Aq Mt trasz@FreeBSD.org
diff --git a/lib/libc/stdio/printf.3 b/lib/libc/stdio/printf.3
index 05c30dcfb52..058f9a9f7d6 100644
--- a/lib/libc/stdio/printf.3
+++ b/lib/libc/stdio/printf.3
@@ -827,14 +827,14 @@ first appeared in the
 .Tn GNU C
 library.
 These were implemented by
-.An Peter Wemm Aq peter@FreeBSD.org
+.An Peter Wemm Aq Mt peter@FreeBSD.org
 in
 .Fx 2.2 ,
 but were later replaced with a different implementation
 from
 .Ox 2.3
 by
-.An Todd C. Miller Aq Todd.Miller@courtesan.com .
+.An Todd C. Miller Aq Mt Todd.Miller@courtesan.com .
 The
 .Fn dprintf
 and
diff --git a/lib/libc/stdlib/a64l.3 b/lib/libc/stdlib/a64l.3
index 61fbffdbab3..eadc2f39346 100644
--- a/lib/libc/stdlib/a64l.3
+++ b/lib/libc/stdlib/a64l.3
@@ -181,7 +181,7 @@ functions
 were added to
 .Fx
 by
-.An Tom Rhodes Aq trhodes@FreeBSD.org .
+.An Tom Rhodes Aq Mt trhodes@FreeBSD.org .
 Almost all of this manual page came from the
 .Tn POSIX
 standard.
diff --git a/lib/libc/stdlib/strfmon.3 b/lib/libc/stdlib/strfmon.3
index f82dfa30290..47f7131b677 100644
--- a/lib/libc/stdlib/strfmon.3
+++ b/lib/libc/stdlib/strfmon.3
@@ -171,10 +171,10 @@ function conforms to
 The
 .Fn strfmon
 function was implemented by
-.An Alexey Zelkin Aq phantom@FreeBSD.org .
+.An Alexey Zelkin Aq Mt phantom@FreeBSD.org .
 .Pp
 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
 based on the standards' text.
 .Sh BUGS
 The
diff --git a/lib/libc/string/memmem.3 b/lib/libc/string/memmem.3
index 73c267c14c1..31cdf77135e 100644
--- a/lib/libc/string/memmem.3
+++ b/lib/libc/string/memmem.3
@@ -80,7 +80,7 @@ The
 function first appeared in
 .Fx 6.0 .
 .Sh AUTHORS
-.An Pascal Gloor Aq pascal.gloor@spale.com
+.An Pascal Gloor Aq Mt pascal.gloor@spale.com
 .Sh BUGS
 This function was broken in Linux libc up to and including version 5.0.9
 and in GNU libc prior to version 2.1.
diff --git a/lib/libc/string/strerror.3 b/lib/libc/string/strerror.3
index 50b15553001..a47494fd078 100644
--- a/lib/libc/string/strerror.3
+++ b/lib/libc/string/strerror.3
@@ -172,7 +172,7 @@ The
 function was implemented in
 .Fx 4.4
 by
-.An Wes Peters Aq wes@FreeBSD.org .
+.An Wes Peters Aq Mt wes@FreeBSD.org .
 .Sh BUGS
 The
 .Fn strerror
diff --git a/lib/libc/string/strtok.3 b/lib/libc/string/strtok.3
index 97a8b156b92..78c22655d4a 100644
--- a/lib/libc/string/strtok.3
+++ b/lib/libc/string/strtok.3
@@ -150,9 +150,8 @@ function
 conforms to
 .St -isoC .
 .Sh AUTHORS
-.An Wes Peters ,
-Softweyr LLC:
-.Aq wes@softweyr.com
+.An Wes Peters Aq Mt wes@softweyr.com ,
+Softweyr LLC
 .Pp
 Based on the
 .Fx 3.0
diff --git a/lib/libc/sys/abort2.2 b/lib/libc/sys/abort2.2
index 4698c728384..ca31d74267f 100644
--- a/lib/libc/sys/abort2.2
+++ b/lib/libc/sys/abort2.2
@@ -108,6 +108,6 @@ system call first appeared in
 The
 .Fn abort2
 system call was designed by
-.An "Poul-Henning Kamp" Aq phk@FreeBSD.org .
+.An Poul-Henning Kamp Aq Mt phk@FreeBSD.org .
 It was implemented by
-.An "Wojciech A. Koszek" Aq dunstan@freebsd.czest.pl .
+.An Wojciech A. Koszek Aq Mt dunstan@freebsd.czest.pl .
diff --git a/lib/libc/sys/aio_cancel.2 b/lib/libc/sys/aio_cancel.2
index 54e7b394fc8..3d9cbaf2ff4 100644
--- a/lib/libc/sys/aio_cancel.2
+++ b/lib/libc/sys/aio_cancel.2
@@ -109,8 +109,8 @@ appeared in
 .An -nosplit
 This
 manual page was originally written by
-.An Wes Peters Aq wes@softweyr.com .
-.An Christopher M Sedore Aq cmsedore@maxwell.syr.edu
+.An Wes Peters Aq Mt wes@softweyr.com .
+.An Christopher M Sedore Aq Mt cmsedore@maxwell.syr.edu
 updated it when
 .Fn aio_cancel
 was implemented for
diff --git a/lib/libc/sys/aio_error.2 b/lib/libc/sys/aio_error.2
index f63a2dd06c2..03091461612 100644
--- a/lib/libc/sys/aio_error.2
+++ b/lib/libc/sys/aio_error.2
@@ -98,4 +98,4 @@ system call first appeared in
 .Sh AUTHORS
 This
 manual page was written by
-.An Wes Peters Aq wes@softweyr.com .
+.An Wes Peters Aq Mt wes@softweyr.com .
diff --git a/lib/libc/sys/aio_mlock.2 b/lib/libc/sys/aio_mlock.2
index 386393f32b1..95055e8c42b 100644
--- a/lib/libc/sys/aio_mlock.2
+++ b/lib/libc/sys/aio_mlock.2
@@ -130,4 +130,4 @@ system call first appeared in
 .Fx 10.0 .
 .Sh AUTHORS
 The system call was introduced by
-.An Gleb Smirnoff Aq glebius@FreeBSD.org .
+.An Gleb Smirnoff Aq Mt glebius@FreeBSD.org .
diff --git a/lib/libc/sys/aio_read.2 b/lib/libc/sys/aio_read.2
index ddf4f763023..65b5e10d75f 100644
--- a/lib/libc/sys/aio_read.2
+++ b/lib/libc/sys/aio_read.2
@@ -207,7 +207,7 @@ system call first appeared in
 .Sh AUTHORS
 This
 manual page was written by
-.An Terry Lambert Aq terry@whistle.com .
+.An Terry Lambert Aq Mt terry@whistle.com .
 .Sh BUGS
 Invalid information in
 .Fa iocb->_aiocb_private
diff --git a/lib/libc/sys/aio_return.2 b/lib/libc/sys/aio_return.2
index 2034f9d0482..2ef6c25953f 100644
--- a/lib/libc/sys/aio_return.2
+++ b/lib/libc/sys/aio_return.2
@@ -99,4 +99,4 @@ system call first appeared in
 .Sh AUTHORS
 This
 manual page was written by
-.An Wes Peters Aq wes@softweyr.com .
+.An Wes Peters Aq Mt wes@softweyr.com .
diff --git a/lib/libc/sys/aio_suspend.2 b/lib/libc/sys/aio_suspend.2
index 5859d1527a9..0ff25f51c5a 100644
--- a/lib/libc/sys/aio_suspend.2
+++ b/lib/libc/sys/aio_suspend.2
@@ -114,4 +114,4 @@ system call first appeared in
 .Sh AUTHORS
 This
 manual page was written by
-.An Wes Peters Aq wes@softweyr.com .
+.An Wes Peters Aq Mt wes@softweyr.com .
diff --git a/lib/libc/sys/aio_waitcomplete.2 b/lib/libc/sys/aio_waitcomplete.2
index 5145f78118a..885b3d7fa48 100644
--- a/lib/libc/sys/aio_waitcomplete.2
+++ b/lib/libc/sys/aio_waitcomplete.2
@@ -134,4 +134,4 @@ system call first appeared in
 The
 .Fn aio_waitcomplete
 system call and this manual page were written by
-.An Christopher M Sedore Aq cmsedore@maxwell.syr.edu .
+.An Christopher M Sedore Aq Mt cmsedore@maxwell.syr.edu .
diff --git a/lib/libc/sys/aio_write.2 b/lib/libc/sys/aio_write.2
index 291fd7154bf..080a6b8bbf5 100644
--- a/lib/libc/sys/aio_write.2
+++ b/lib/libc/sys/aio_write.2
@@ -202,7 +202,7 @@ system call first appeared in
 .Fx 3.0 .
 .Sh AUTHORS
 This manual page was written by
-.An Wes Peters Aq wes@softweyr.com .
+.An Wes Peters Aq Mt wes@softweyr.com .
 .Sh BUGS
 Invalid information in
 .Fa iocb->_aiocb_private
diff --git a/lib/libc/sys/bindat.2 b/lib/libc/sys/bindat.2
index 9274679374a..692099092d6 100644
--- a/lib/libc/sys/bindat.2
+++ b/lib/libc/sys/bindat.2
@@ -105,5 +105,5 @@ nor a file descriptor associated with a directory.
 The
 .Nm
 was developed by
-.An Pawel Jakub Dawidek Aq pawel@dawidek.net
+.An Pawel Jakub Dawidek Aq Mt pawel@dawidek.net
 under sponsorship from the FreeBSD Foundation.
diff --git a/lib/libc/sys/cap_fcntls_limit.2 b/lib/libc/sys/cap_fcntls_limit.2
index 0f792a5bb3d..193d97da37e 100644
--- a/lib/libc/sys/cap_fcntls_limit.2
+++ b/lib/libc/sys/cap_fcntls_limit.2
@@ -122,5 +122,5 @@ Support for capabilities and capabilities mode was developed as part of the
 Project.
 .Sh AUTHORS
 This function was created by
-.An Pawel Jakub Dawidek Aq pawel@dawidek.net
+.An Pawel Jakub Dawidek Aq Mt pawel@dawidek.net
 under sponsorship of the FreeBSD Foundation.
diff --git a/lib/libc/sys/cap_ioctls_limit.2 b/lib/libc/sys/cap_ioctls_limit.2
index 4fdd2551d27..2d1eef9724c 100644
--- a/lib/libc/sys/cap_ioctls_limit.2
+++ b/lib/libc/sys/cap_ioctls_limit.2
@@ -153,5 +153,5 @@ Support for capabilities and capabilities mode was developed as part of the
 Project.
 .Sh AUTHORS
 This function was created by
-.An Pawel Jakub Dawidek Aq pawel@dawidek.net
+.An Pawel Jakub Dawidek Aq Mt pawel@dawidek.net
 under sponsorship of the FreeBSD Foundation.
diff --git a/lib/libc/sys/cap_rights_limit.2 b/lib/libc/sys/cap_rights_limit.2
index 33b57e135c5..4663951e502 100644
--- a/lib/libc/sys/cap_rights_limit.2
+++ b/lib/libc/sys/cap_rights_limit.2
@@ -153,5 +153,5 @@ Support for capabilities and capabilities mode was developed as part of the
 Project.
 .Sh AUTHORS
 This function was created by
-.An Pawel Jakub Dawidek Aq pawel@dawidek.net
+.An Pawel Jakub Dawidek Aq Mt pawel@dawidek.net
 under sponsorship of the FreeBSD Foundation.
diff --git a/lib/libc/sys/connectat.2 b/lib/libc/sys/connectat.2
index 8cebf98372e..759b7eac8e2 100644
--- a/lib/libc/sys/connectat.2
+++ b/lib/libc/sys/connectat.2
@@ -105,5 +105,5 @@ nor a file descriptor associated with a directory.
 The
 .Nm
 was developed by
-.An Pawel Jakub Dawidek Aq pawel@dawidek.net
+.An Pawel Jakub Dawidek Aq Mt pawel@dawidek.net
 under sponsorship from the FreeBSD Foundation.
diff --git a/lib/libc/sys/cpuset.2 b/lib/libc/sys/cpuset.2
index 3e76de39ca3..0c32b42192e 100644
--- a/lib/libc/sys/cpuset.2
+++ b/lib/libc/sys/cpuset.2
@@ -224,5 +224,5 @@ The
 .Nm
 family of system calls first appeared in
 .Fx 7.1 .
-.Sh AUTHOR
-.An Jeffrey Roberson Aq jeff@FreeBSD.org
+.Sh AUTHORS
+.An Jeffrey Roberson Aq Mt jeff@FreeBSD.org
diff --git a/lib/libc/sys/cpuset_getaffinity.2 b/lib/libc/sys/cpuset_getaffinity.2
index 93cfe95dae2..810a03c72e9 100644
--- a/lib/libc/sys/cpuset_getaffinity.2
+++ b/lib/libc/sys/cpuset_getaffinity.2
@@ -159,5 +159,5 @@ The
 .Nm
 family of system calls first appeared in
 .Fx 7.1 .
-.Sh AUTHOR
-.An Jeffrey Roberson Aq jeff@FreeBSD.org
+.Sh AUTHORS
+.An Jeffrey Roberson Aq Mt jeff@FreeBSD.org
diff --git a/lib/libc/sys/ffclock.2 b/lib/libc/sys/ffclock.2
index 68ea922e4d6..78fed527b14 100644
--- a/lib/libc/sys/ffclock.2
+++ b/lib/libc/sys/ffclock.2
@@ -171,7 +171,7 @@ Feed-forward clock support first appeared in
 .Sh AUTHORS
 .An -nosplit
 The feed-forward clock support was written by
-.An Julien Ridoux Aq jridoux@unimelb.edu.au
+.An Julien Ridoux Aq Mt jridoux@unimelb.edu.au
 in collaboration with
-.An Darryl Veitch Aq dveitch@unimelb.edu.au
+.An Darryl Veitch Aq Mt dveitch@unimelb.edu.au
 at the University of Melbourne under sponsorship from the FreeBSD Foundation.
diff --git a/lib/libc/sys/kenv.2 b/lib/libc/sys/kenv.2
index 866c0d38a6f..dc17388f08b 100644
--- a/lib/libc/sys/kenv.2
+++ b/lib/libc/sys/kenv.2
@@ -171,9 +171,9 @@ or the value of a variable is longer than
 .Sh AUTHORS
 .An -nosplit
 This manual page was written by
-.An Chad David Aq davidc@FreeBSD.org .
+.An Chad David Aq Mt davidc@FreeBSD.org .
 .Pp
 The
 .Fn kenv
 system call was written by
-.An Maxime Henrion Aq mux@FreeBSD.org .
+.An Maxime Henrion Aq Mt mux@FreeBSD.org .
diff --git a/lib/libc/sys/kqueue.2 b/lib/libc/sys/kqueue.2
index b9e496a3c9c..6f637e18afe 100644
--- a/lib/libc/sys/kqueue.2
+++ b/lib/libc/sys/kqueue.2
@@ -613,7 +613,7 @@ system calls first appeared in
 The
 .Fn kqueue
 system and this manual page were written by
-.An Jonathan Lemon Aq jlemon@FreeBSD.org .
+.An Jonathan Lemon Aq Mt jlemon@FreeBSD.org .
 .Sh BUGS
 The
 .Fa timeout
diff --git a/lib/libc/sys/kse.2 b/lib/libc/sys/kse.2
index 41fcc373ea8..95e72562404 100644
--- a/lib/libc/sys/kse.2
+++ b/lib/libc/sys/kse.2
@@ -665,15 +665,15 @@ The KSE system calls first appeared in
 .Sh AUTHORS
 KSE was originally implemented by
 .An -nosplit
-.An "Julian Elischer" Aq julian@FreeBSD.org ,
+.An Julian Elischer Aq Mt julian@FreeBSD.org ,
 with additional contributions by
-.An "Jonathan Mini" Aq mini@FreeBSD.org ,
-.An "Daniel Eischen" Aq deischen@FreeBSD.org ,
+.An Jonathan Mini Aq Mt mini@FreeBSD.org ,
+.An Daniel Eischen Aq Mt deischen@FreeBSD.org ,
 and
-.An "David Xu" Aq davidxu@FreeBSD.org .
+.An David Xu Aq Mt davidxu@FreeBSD.org .
 .Pp
 This manual page was written by
-.An "Archie Cobbs" Aq archie@FreeBSD.org .
+.An Archie Cobbs Aq Mt archie@FreeBSD.org .
 .Sh BUGS
 The KSE code is
 .Ud
diff --git a/lib/libc/sys/pdfork.2 b/lib/libc/sys/pdfork.2
index a4895159f2a..e057f769b89 100644
--- a/lib/libc/sys/pdfork.2
+++ b/lib/libc/sys/pdfork.2
@@ -188,9 +188,9 @@ Project.
 .Sh AUTHORS
 .An -nosplit
 These functions and the capability facility were created by
-.An "Robert N. M. Watson" Aq rwatson@FreeBSD.org
+.An Robert N. M. Watson Aq Mt rwatson@FreeBSD.org
 and
-.An "Jonathan Anderson" Aq jonathan@FreeBSD.org
+.An Jonathan Anderson Aq Mt jonathan@FreeBSD.org
 at the University of Cambridge Computer Laboratory with support from a grant
 from Google, Inc.
 .Sh BUGS
diff --git a/lib/libc/sys/posix_fallocate.2 b/lib/libc/sys/posix_fallocate.2
index 750177751e9..4c92d9b9c2b 100644
--- a/lib/libc/sys/posix_fallocate.2
+++ b/lib/libc/sys/posix_fallocate.2
@@ -141,4 +141,4 @@ function appeared in
 .Sh AUTHORS
 .Fn posix_fallocate
 and this manual page were initially written by
-.An Matthew Fleming Aq mdf@FreeBSD.org .
+.An Matthew Fleming Aq Mt mdf@FreeBSD.org .
diff --git a/lib/libc/sys/posix_openpt.2 b/lib/libc/sys/posix_openpt.2
index 9ba26068ac7..916e75ac586 100644
--- a/lib/libc/sys/posix_openpt.2
+++ b/lib/libc/sys/posix_openpt.2
@@ -137,4 +137,4 @@ is included for compatibility; in
 opening a terminal does not cause it to become a process's controlling
 terminal.
 .Sh AUTHORS
-.An Ed Schouten Aq ed@FreeBSD.org
+.An Ed Schouten Aq Mt ed@FreeBSD.org
diff --git a/lib/libc/sys/pselect.2 b/lib/libc/sys/pselect.2
index ed66aade1cd..6221c473e7d 100644
--- a/lib/libc/sys/pselect.2
+++ b/lib/libc/sys/pselect.2
@@ -120,4 +120,4 @@ function first appeared in
 The first implementation of
 .Fn pselect
 function and this manual page were written by
-.An Garrett Wollman Aq wollman@FreeBSD.org .
+.An Garrett Wollman Aq Mt wollman@FreeBSD.org .
diff --git a/lib/libc/sys/rtprio.2 b/lib/libc/sys/rtprio.2
index f30ed225475..23088a70596 100644
--- a/lib/libc/sys/rtprio.2
+++ b/lib/libc/sys/rtprio.2
@@ -188,7 +188,7 @@ The specified process or thread was not found or visible.
 .Sh AUTHORS
 .An -nosplit
 The original author was
-.An Henrik Vestergaard Draboel Aq hvd@terry.ping.dk .
+.An Henrik Vestergaard Draboel Aq Mt hvd@terry.ping.dk .
 This implementation in
 .Fx
 was substantially rewritten by
diff --git a/lib/libc/sys/sendfile.2 b/lib/libc/sys/sendfile.2
index 0e7dbe36263..b363382af15 100644
--- a/lib/libc/sys/sendfile.2
+++ b/lib/libc/sys/sendfile.2
@@ -315,4 +315,4 @@ The
 .Fn sendfile
 system call
 and this manual page were written by
-.An David G. Lawrence Aq dg@dglawrence.com .
+.An David G. Lawrence Aq Mt dg@dglawrence.com .
diff --git a/lib/libc/sys/shm_open.2 b/lib/libc/sys/shm_open.2
index 76d8f3c150a..b56f717b76d 100644
--- a/lib/libc/sys/shm_open.2
+++ b/lib/libc/sys/shm_open.2
@@ -275,8 +275,8 @@ The functions were reimplemented as system calls using shared memory objects
 directly rather than files in
 .Fx 8.0 .
 .Sh AUTHORS
-.An Garrett A. Wollman Aq wollman@FreeBSD.org
+.An Garrett A. Wollman Aq Mt wollman@FreeBSD.org
 (C library support and this manual page)
 .Pp
-.An Matthew Dillon Aq dillon@FreeBSD.org
+.An Matthew Dillon Aq Mt dillon@FreeBSD.org
 .Pq Dv MAP_NOSYNC
diff --git a/lib/libc/sys/shutdown.2 b/lib/libc/sys/shutdown.2
index 70211ffb2eb..e8a434b2395 100644
--- a/lib/libc/sys/shutdown.2
+++ b/lib/libc/sys/shutdown.2
@@ -171,7 +171,7 @@ constants appeared in
 .Sh AUTHORS
 .An -nosplit
 This manual page was updated by
-.An Bruce M. Simpson Aq bms@FreeBSD.org
+.An Bruce M. Simpson Aq Mt bms@FreeBSD.org
 to reflect how
 .Fn shutdown
 behaves with