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