diff --git a/usr.bin/skey/skey.1 b/usr.bin/skey/skey.1
index 1865ed41be9..ba3832f3aed 100644
--- a/usr.bin/skey/skey.1
+++ b/usr.bin/skey/skey.1
@@ -1,7 +1,7 @@
-.\" $OpenBSD: skey.1,v 1.34 2014/03/20 20:39:13 naddy Exp $
+.\" $OpenBSD: skey.1,v 1.35 2015/01/16 16:16:36 schwarze Exp $
 .\"	@(#)skey.1	1.1 	10/28/93
 .\"
-.Dd $Mdocdate: March 20 2014 $
+.Dd $Mdocdate: January 16 2015 $
 .Dt SKEY 1
 .Os
 .Sh NAME
@@ -108,4 +108,7 @@ $
 .Sh TRADEMARKS AND PATENTS
 S/Key is a Trademark of Bellcore.
 .Sh AUTHORS
-Phil Karn, Neil M. Haller, John S. Walden, Scott Chasin
+.An Phil Karn
+.An Neil M. Haller
+.An John S. Walden
+.An Scott Chasin
diff --git a/usr.bin/skeyinit/skeyinit.1 b/usr.bin/skeyinit/skeyinit.1
index 652369548e4..c3312af9b6f 100644
--- a/usr.bin/skeyinit/skeyinit.1
+++ b/usr.bin/skeyinit/skeyinit.1
@@ -1,8 +1,8 @@
-.\"	$OpenBSD: skeyinit.1,v 1.38 2014/04/23 18:24:23 ajacoutot Exp $
+.\"	$OpenBSD: skeyinit.1,v 1.39 2015/01/16 16:16:36 schwarze Exp $
 .\"	$NetBSD: skeyinit.1,v 1.4 1995/07/07 22:24:09 jtc Exp $
 .\"	@(#)skeyinit.1	1.1 	10/28/93
 .\"
-.Dd $Mdocdate: April 23 2014 $
+.Dd $Mdocdate: January 16 2015 $
 .Dt SKEYINIT 1
 .Os
 .Sh NAME
@@ -198,4 +198,8 @@ flag.
 .Xr skey 5 ,
 .Xr skeyprune 8
 .Sh AUTHORS
-Phil Karn, Neil M. Haller, John S. Walden, Scott Chasin, Todd Miller
+.An Phil Karn
+.An Neil M. Haller
+.An John S. Walden
+.An Scott Chasin
+.An Todd Miller
diff --git a/usr.bin/sudo/sudo.mdoc.in b/usr.bin/sudo/sudo.mdoc.in
index b55bf82a2fd..6947fc4e37b 100644
--- a/usr.bin/sudo/sudo.mdoc.in
+++ b/usr.bin/sudo/sudo.mdoc.in
@@ -19,7 +19,7 @@
 .\" Agency (DARPA) and Air Force Research Laboratory, Air Force
 .\" Materiel Command, USAF, under agreement number F39502-99-1-0512.
 .\"
-.Dd $Mdocdate: February 16 2014 $
+.Dd $Mdocdate: January 16 2015 $
 .Dt SUDO @mansectsu@
 .Os
 .Sh NAME
@@ -1384,7 +1384,7 @@ Many people have worked on
 .Nm sudo
 over the years; this version consists of code written primarily by:
 .Bd -ragged -offset indent
-Todd C. Miller
+.An Todd C. Miller
 .Ed
 .Pp
 See the CONTRIBUTORS file in the
diff --git a/usr.bin/sudo/visudo.mdoc.in b/usr.bin/sudo/visudo.mdoc.in
index fd0dbbb2ef9..cc9f4550d51 100644
--- a/usr.bin/sudo/visudo.mdoc.in
+++ b/usr.bin/sudo/visudo.mdoc.in
@@ -19,7 +19,7 @@
 .\" Agency (DARPA) and Air Force Research Laboratory, Air Force
 .\" Materiel Command, USAF, under agreement number F39502-99-1-0512.
 .\"
-.Dd $Mdocdate: February 15 2014 $
+.Dd $Mdocdate: January 16 2015 $
 .Dt VISUDO @mansectsu@
 .Os
 .Sh NAME
@@ -189,7 +189,8 @@ letters, digits, and the underscore
 character.
 .It Fl V
 The
-.Fl V ( Em version Ns No )
+.Fl V
+.Pq Em version
 option causes
 .Nm visudo
 to print its version number
@@ -275,7 +276,7 @@ Many people have worked on
 .Nm sudo
 over the years; this version consists of code written primarily by:
 .Bd -ragged -offset indent
-Todd C. Miller
+.An Todd C. Miller
 .Ed
 .Pp
 See the CONTRIBUTORS file in the