diff --git a/contrib/amd/amq/amq.8 b/contrib/amd/amq/amq.8
index 5cfbf5c0f69..1faebc692e1 100644
--- a/contrib/amd/amq/amq.8
+++ b/contrib/amd/amq/amq.8
@@ -48,7 +48,7 @@
 .Nm amq
 .Nd automounter query tool
 .Sh SYNOPSIS
-.Nm amq
+.Nm
 .Op Fl fmpsvwHTU
 .Op Fl h Ar hostname
 .Op Fl l Ar log_file
@@ -259,7 +259,9 @@ entry.
 .%T Amd \- The 4.4 BSD Automounter
 .Re
 .Sh HISTORY
-.Nm Amq
+The
+.Nm
+utility
 first appeared in
 .Bx 4.4 .
 .Sh AUTHORS
diff --git a/contrib/amd/fixmount/fixmount.8 b/contrib/amd/fixmount/fixmount.8
index b438298e49b..07e34d17ef3 100644
--- a/contrib/amd/fixmount/fixmount.8
+++ b/contrib/amd/fixmount/fixmount.8
@@ -155,7 +155,7 @@ Department of Computer Science, Columbia University, New York, USA.
 .An Other authors and contributors to
 .Nm am-utils
 are listed in the
-.Nm AUTHORS
+.Pa AUTHORS
 file distributed with
 .Nm am-utils .
 .Sh AUTHORS
diff --git a/contrib/amd/fsinfo/fsinfo.8 b/contrib/amd/fsinfo/fsinfo.8
index ecea27847ef..c4f817ec910 100644
--- a/contrib/amd/fsinfo/fsinfo.8
+++ b/contrib/amd/fsinfo/fsinfo.8
@@ -179,17 +179,13 @@ Inverse of the
 option.
 .It Ar config
 One or more configuration files to be passed as input to
-.Nm fsinfo .
+.Nm .
 .El
 .Pp
 The
 .Nm
 command is fully described in the document
-.%T "Amd - The 4.4BSD Automounter"
-and in the
-.Nm amd
-section in
-.Xr info 1 .
+.%T "Amd - The 4.4BSD Automounter" .
 .Sh SEE ALSO
 .Xr amd 8 ,
 .Xr mount 8 ,