--- ./man/passwd.1.orig	2002-03-13 11:52:15.000000000 -0600
+++ ./man/passwd.1	2006-08-20 18:29:58.000000000 -0500
@@ -29,26 +29,17 @@
 .SH NAME
 passwd \- change user password
 .SH SYNOPSIS
-\fBpasswd\fR [\fB-f\fR|\fB-s\fR] [\fIname\fR]
-.br
-\fBpasswd\fR [\fB-g\fR] [\fB-r\fR|\fB-R\fR] \fIgroup\fR
+\fBpasswd\fR [\fIname\fR]
 .br
 \fBpasswd\fR [\fB-x \fImax\fR] [\fB-n \fImin\fR]
 [\fB-w \fIwarn\fR] [\fB-i \fIinact\fR] \fIlogin\fR
 .br
 \fBpasswd\fR {\fB-l\fR|\fB-u\fR|\fB-d\fR|\fB-S\fR|\fB-e\fR} \fIlogin\fR
 .SH DESCRIPTION
-\fBpasswd\fR changes passwords for user and group accounts.
+\fBpasswd\fR changes passwords for user accounts.
 A normal user may only change the password for his/her own account,
 the super user may change the password for any account.
-The administrator of a group may change the password for the group.
-\fBpasswd\fR also changes account information, such as the full name
-of the user, user's login shell, or password expiry date and interval.
-.PP
-The \fB-s\fR option makes passwd call chsh to change the user's shell. The
-\fB-f\fR option makes passwd call chfn to change the user's gecos
-information. These two options are only meant for compatiblity, since the
-other programs can be called directly.
+.PP
 .SS Password Changes
 The user is first prompted for his/her old password, if one is present.
 This password is then encrypted and compared against the
@@ -86,17 +77,6 @@
 against the first.
 Both entries are required to match in order for the password
 to be changed.
-.SS Group passwords
-When the \fB-g\fR option is used, the password for the named
-group is changed.
-The user must either be the super user, or a group administrator
-for the named group.
-The current group password is not prompted for.
-The \fB-r\fR option is used with the \fB-g\fR option to remove
-the current password from the named group.
-This allows group access to all members.
-The \fB-R\fR option is used with the \fB-g\fR option to restrict
-the named group for all users.
 .SS Password expiry information
 The password aging information may be changed by the super
 user with the \fB-x\fR, \fB-n\fR, \fB-w\fR, and \fB-i\fR options.
@@ -191,6 +171,9 @@
 .br
 /etc/shadow \- encrypted user passwords
 .SH "SEE ALSO"
+.BR chfn (1),
+.BR chsh (1),
+.BR gpasswd (1),
 .BR group (5),
 .BR passwd (5)
 .SH AUTHOR
--- ./src/passwd.c.orig	2002-01-05 09:41:43.000000000 -0600
+++ ./src/passwd.c	2006-08-20 18:31:50.000000000 -0500
@@ -955,6 +955,7 @@
 	 * Please run these programs directly.  --marekm
 	 */
 
+#ifdef I_LIKE_OBSOLETE_OPTIONS
 	if (argc > 1 && argv[1][0] == '-' && strchr ("gfs", argv[1][1])) {
 		char buf[200];
 
@@ -980,6 +981,7 @@
 		closelog ();
 		exit (E_FAILURE);
 	}
+#endif
 
 	/* 
 	 * The remaining arguments will be processed one by one and executed