diff --git a/appl/otp/otp.1 b/appl/otp/otp.1
index ba20e6b98..1c52611a7 100644
--- a/appl/otp/otp.1
+++ b/appl/otp/otp.1
@@ -8,12 +8,8 @@
 .Nd
 manages one-time passwords
 .Sh SYNOPSIS
-.Ar otp
-.Op Fl r
-.Op Fl d
-.Op Fl o
-.Op Fl l
-.Op Fl h
+.Nm otp
+.Op Fl dhlor
 .Op Fl f Ar algorithm
 .Op Fl u Ar user
 .Ar sequence-number
@@ -33,6 +29,18 @@ and
 .Pp
 Options are:
 .Bl -tag -width Ds
+.It Fl d
+To delete a one-time password.
+.It Fl f
+Choose a different
+.Ar algorithm
+from the default md5.  Pick any of: md4, md5, and sha.
+.It Fl h
+For getting a help message.
+.It Fl l
+List the current table of one-time passwords.
+.It Fl o
+To open (unlock) the otp-entry for a user.
 .It Fl r
 To renew a one-time password series.  This operation can be performed
 over an potentially eavesdropped link because you do not supply the
@@ -41,23 +49,12 @@ and then the new one corresponding to the supplied
 .Ar sequence-number
 and
 .Ar seed .
-.It Fl d
-To delete a one-time password.
-.It Fl o
-To open (unlock) the otp-entry for a user.
-.It Fl l
-List the current table of one-time passwords.
-.It Fl h
-For getting a help message.
-.It Fl f
-Choose a different
-.Ar algorithm
-from the default md5.  Pick any of: md4, md5, and sha.
 .It Fl u
 To choose a different
 .Ar user
 to set one-time passwords for.  This only works when running
 .Nm
 as root.
+.El
 .Sh SEE ALSO
 .Xr otpprint 1
diff --git a/appl/otp/otpprint.1 b/appl/otp/otpprint.1
index d76588666..011abf282 100644
--- a/appl/otp/otpprint.1
+++ b/appl/otp/otpprint.1
@@ -8,7 +8,7 @@
 .Nd
 print lists of one-time passwords
 .Sh SYNOPSIS
-.Ar otp
+.Nm otp
 .Op Fl n Ar count
 .Op Fl e
 .Op Fl h
@@ -32,14 +32,6 @@ each password with six short english words.
 .Pp
 Options are:
 .Bl -tag -width Ds
-.It Fl n
-Print
-.Ar count
-one-time passwords, starting at
-.Ar sequence-number
-and going backwards. The default is 10.
-.It Fl h
-Print the passwords in hex.
 .It Fl e
 Print the passwords in ``extended'' format.  In this format a prefix
 that says ``hex:'' or ``word:'' is included.
@@ -47,5 +39,14 @@ that says ``hex:'' or ``word:'' is included.
 To choose a different
 .Ar algorithm
 from the default md5.  Pick any of: md4, md5, and sha.
+.It Fl h
+Print the passwords in hex.
+.It Fl n
+Print
+.Ar count
+one-time passwords, starting at
+.Ar sequence-number
+and going backwards. The default is 10.
+.El
 .Sh SEE ALSO
 .Xr otp 1