diff --git a/appl/otp/otp.1 b/appl/otp/otp.1
new file mode 100644
index 000000000..ba20e6b98
--- /dev/null
+++ b/appl/otp/otp.1
@@ -0,0 +1,63 @@
+.\" $Id$
+.\"
+.Dd November 17, 1996
+.Dt OTP 1
+.Os KTH-KRB
+.Sh NAME
+.Nm otp
+.Nd
+manages one-time passwords
+.Sh SYNOPSIS
+.Ar otp
+.Op Fl r
+.Op Fl d
+.Op Fl o
+.Op Fl l
+.Op Fl h
+.Op Fl f Ar algorithm
+.Op Fl u Ar user
+.Ar sequence-number
+.Ar seed
+.Sh DESCRIPTION
+The
+.Nm
+program initializes and updates your current series of one-time
+passwords (OTPs).
+.Pp
+Use this to set a new series of one-time passwords.  Only perform this
+on the console or over an encrypted link as you will have to supply
+your pass-phrase.  The other two parameters are
+.Ar sequence-number
+and
+.Ar seed .
+.Pp
+Options are:
+.Bl -tag -width Ds
+.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
+pass-phrase.  First you need to supply the current one-time password
+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.
+.Sh SEE ALSO
+.Xr otpprint 1
diff --git a/appl/otp/otpprint.1 b/appl/otp/otpprint.1
new file mode 100644
index 000000000..d76588666
--- /dev/null
+++ b/appl/otp/otpprint.1
@@ -0,0 +1,51 @@
+.\" $Id$
+.\"
+.Dd November 17, 1996
+.Dt OTP 1
+.Os KTH-KRB
+.Sh NAME
+.Nm otpprint
+.Nd
+print lists of one-time passwords
+.Sh SYNOPSIS
+.Ar otp
+.Op Fl n Ar count
+.Op Fl e
+.Op Fl h
+.Op Fl f Ar algorithm
+.Ar sequence-number
+.Ar seed
+.Sh DESCRIPTION
+The
+.Nm
+program prints lists of OTPs.
+.Pp
+Use this to print out a series of one-time passwords.  You will have
+to supply the
+.Ar sequence number
+and the
+.Ar seed
+as arguments and then the program will prompt you for your pass-phrase.
+.Pp
+There are several different print formats.  The default is to print
+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.
+.It Fl f
+To choose a different
+.Ar algorithm
+from the default md5.  Pick any of: md4, md5, and sha.
+.Sh SEE ALSO
+.Xr otp 1
diff --git a/appl/xnlock/Makefile.am b/appl/xnlock/Makefile.am
index 0991f6b27..72ecd3dd6 100644
--- a/appl/xnlock/Makefile.am
+++ b/appl/xnlock/Makefile.am
@@ -16,7 +16,7 @@ bin_PROGRAMS =
 
 endif
 
-man_MANS = xnlock.man
+man_MANS = xnlock.1
 
 EXTRA_DIST = $(man_MANS) nose.0.left nose.0.right nose.1.left nose.1.right \
 	nose.down nose.front nose.left.front nose.right.front
diff --git a/appl/xnlock/xnlock.man b/appl/xnlock/xnlock.1
similarity index 100%
rename from appl/xnlock/xnlock.man
rename to appl/xnlock/xnlock.1