diff --git a/share/man/man5/passwd.5 b/share/man/man5/passwd.5
index 9628beb96d2..d8869daf724 100644
--- a/share/man/man5/passwd.5
+++ b/share/man/man5/passwd.5
@@ -57,7 +57,7 @@ User's id.
 .It gid
 User's login group id.
 .It class
-User's general classification (unused).
+User's login class.
 .It change
 Password change time.
 .It expire
@@ -98,18 +98,26 @@ field is empty, no password will be required to gain access to the
 machine.  This is almost invariably a mistake.
 Because these files contain the encrypted user passwords, they should
 not be readable by anyone without appropriate privileges.
+Administrative accounts have a password field containing an asterisk
+.Ql \&*
+which disallows normal logins.
 .Pp
 The group field is the group that the user will be placed in upon login.
-Since this system supports multiple groups (see
+Although this system supports multiple groups (see
 .Xr groups 1 )
-this field currently has little special meaning.
+this field nominates the user's primary groups.
+Secondary group memberships are selected in
+.Pa /etc/group .
 .Pp
 The
 .Ar class
-field is currently unused.  In the near future it will be a key to
-a
+field is a key for a user's login class.
+Login classes are defined in
+.Xr login.conf 5 ,
+which is a
 .Xr termcap 5
-style database of user attributes.
+style database of user attributes, accounting, resource and
+environment settings.
 .Pp
 The
 .Ar change
@@ -117,7 +125,8 @@ field is the number in seconds,
 .Dv GMT ,
 from the epoch, until the
 password for the account must be changed.
-This field may be left empty to turn off the password aging feature.
+This field may be left empty or set to 0 to turn off the
+password aging feature.
 .Pp
 The
 .Ar expire
@@ -125,14 +134,15 @@ field is the number in seconds,
 .Dv GMT ,
 from the epoch, until the
 account expires.
-This field may be left empty to turn off the account aging feature.
+This field may be left empty or set to 0 to turn off the account
+aging feature.
 .Pp
 The
 .Ar gecos
 field normally contains comma (``,'') separated subfields as follows:
 .Pp
 .Bd -unfilled -offset indent
-name		user's full name
+fullname		user's full name
 office		user's office number
 wphone		user's work phone number
 hphone		user's home phone number
@@ -140,7 +150,12 @@ hphone		user's home phone number
 .Pp
 This information is used by the
 .Xr finger 1
-program.
+program, and the first field used by the system mailer.
+If an ampersand
+.Ql \&&
+character appears within the fullname field, programs which
+use this field will substitute it with a capitalized version
+of the account's login name.
 .Pp
 The user's home directory is the full
 .Tn UNIX
@@ -526,7 +541,9 @@ password database, with passwords intact
 .Xr login 1 ,
 .Xr passwd 1 ,
 .Xr getpwent 3 ,
+.Xr login_getclass 3 ,
 .Xr yp 4 ,
+.Xr login.conf 5 ,
 .Xr adduser 8 ,
 .Xr pwd_mkdb 8 ,
 .Xr vipw 8