efefb4
diff --git a/man/passwd.1 b/man/passwd.1
efefb4
index 1bc2a6e..9727b88 100644
efefb4
--- a/man/passwd.1
efefb4
+++ b/man/passwd.1
efefb4
@@ -40,7 +40,7 @@
efefb4
 passwd \- update user's authentication tokens
efefb4
 
efefb4
 .SH SYNOPSIS
efefb4
-.B passwd [-k] [-l] [-u [-f]] [-d] [-e] [-n mindays] [-x maxdays] [-w warndays] [-i inactivedays] [-S] [--stdin] [username]
efefb4
+.B passwd [-k] [-l] [-u [-f]] [-d] [-e] [-n mindays] [-x maxdays] [-w warndays] [-i inactivedays] [-S] [--stdin] [-?] [--usage] [username]
efefb4
 .sp 2
efefb4
 .SH DESCRIPTION
efefb4
 The passwd utility is used to update user's authentication token(s).
efefb4
@@ -82,7 +82,7 @@ function correctly.
efefb4
 .SH OPTIONS
efefb4
 
efefb4
 .TP
efefb4
-\fB\-k\fR, \fB\-\-keep\fR
efefb4
+\fB\-k\fR, \fB\-\-keep\-tokens\fR
efefb4
 The option
efefb4
 .B \-k
efefb4
 is used to indicate that the update should only be for expired
efefb4
@@ -158,8 +158,8 @@ root only.
efefb4
 This will output a short information about the status of the password
efefb4
 for a given account. The status information consists of 7 fields. The
efefb4
 first field is the user's login name. The second field indicates if the
efefb4
-user account has a locked password (L), has no password (NP), or has a
efefb4
-usable password (P). The third field gives the date of the last password
efefb4
+user account has a locked password (LK), has no password (NP), or has a
efefb4
+usable password (PS). The third field gives the date of the last password
efefb4
 change. The next four fields are the minimum age, maximum age, warning
efefb4
 period, and inactivity period for the password. These ages are expressed
efefb4
 in days.
efefb4
@@ -174,6 +174,14 @@ from the real date of the last password change by ±1 day.
efefb4
 .sp
efefb4
 This option is available to root only.
efefb4
 
efefb4
+.TP
efefb4
+\fB\-?\fR, \fB\-\-help\fR
efefb4
+Print a help message and exit.
efefb4
+
efefb4
+.TP
efefb4
+\fB\-\-usage\fR
efefb4
+Print a short usage message and exit.
efefb4
+
efefb4
 .SH "Remember the following two principles"
efefb4
 
efefb4
 .IP \fBProtect\ your\ password.\fR