diff --git a/shadow-4.0.14-goodname.patch b/shadow-4.0.14-goodname.patch
index 6b3bc78..e49adbb 100644
--- a/shadow-4.0.14-goodname.patch
+++ b/shadow-4.0.14-goodname.patch
@@ -1,16 +1,5 @@
---- shadow-4.0.14/man/useradd.8.goodname	2006-01-05 17:54:26.000000000 +0100
-+++ shadow-4.0.14/man/useradd.8	2006-01-05 18:01:18.000000000 +0100
-@@ -166,8 +166,6 @@
- Similarly, if the username already exists in an external user database such as NIS,
- \fBuseradd\fR
- will deny the user account creation request.
--.PP
--Usernames must begin with a lower case letter or an underscore, and only lower case letters, underscores, dashes, and dollar signs may follow. In regular expression terms: [a\-z_][a\-z0\-9_\-]*[$]
- .SH "FILES"
- .TP
- \fI/etc/passwd\fR
---- shadow-4.0.14/libmisc/chkname.c.goodname	2005-08-31 19:24:57.000000000 +0200
-+++ shadow-4.0.14/libmisc/chkname.c	2006-01-05 17:59:45.000000000 +0100
+--- shadow-4.0.18.1/libmisc/chkname.c.goodname	2005-08-31 19:24:57.000000000 +0200
++++ shadow-4.0.18.1/libmisc/chkname.c	2007-06-26 16:20:40.000000000 +0200
 @@ -18,16 +18,24 @@
  static int good_name (const char *name)
  {
@@ -75,3 +64,33 @@
  		return 0;
  
  	return good_name (name);
+--- shadow-4.0.18.1/man/groupadd.8.goodname	2007-06-26 16:20:40.000000000 +0200
++++ shadow-4.0.18.1/man/groupadd.8	2007-06-26 16:22:05.000000000 +0200
+@@ -73,15 +73,11 @@
+ Shadow password suite configuration.
+ .SH "CAVEATS"
+ .PP
+-Groupnames must begin with a lower case letter or an underscore, and only lower case letters, underscores, dashes, and dollar signs may follow. In regular expression terms: [a\-z_][a\-z0\-9_\-]*[$]
+-.PP
+-Groupnames may only be up to 16 characters long.
++Groupnames may only be up to 32 characters long.
+ .PP
+ If the groupname already exists in an external group database such as NIS,
+ \fBgroupadd\fR
+ will deny the group creation request.
+-.PP
+-Groupnames may only be up to 16 characters long.
+ .SH "EXIT VALUES"
+ .PP
+ The
+--- shadow-4.0.18.1/man/useradd.8.goodname	2007-06-26 16:20:40.000000000 +0200
++++ shadow-4.0.18.1/man/useradd.8	2007-06-26 16:20:40.000000000 +0200
+@@ -179,8 +179,6 @@
+ Similarly, if the username already exists in an external user database such as NIS,
+ \fBuseradd\fR
+ will deny the user account creation request.
+-.PP
+-Usernames must begin with a lower case letter or an underscore, and only lower case letters, underscores, dashes, and dollar signs may follow. In regular expression terms: [a\-z_][a\-z0\-9_\-]*[$]
+ .SH "FILES"
+ .TP 3n
+ \fI/etc/passwd\fR
diff --git a/shadow-utils.spec b/shadow-utils.spec
index 11da702..3d853f6 100644
--- a/shadow-utils.spec
+++ b/shadow-utils.spec
@@ -5,7 +5,7 @@
 Summary: Utilities for managing accounts and shadow password files
 Name: shadow-utils
 Version: 4.0.18.1
-Release: 15%{?dist}
+Release: 16%{?dist}
 Epoch: 2
 URL: http://shadow.pld.org.pl/
 Source0: ftp://ftp.pld.org.pl/software/shadow/shadow-%{version}.tar.bz2
@@ -227,6 +227,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/*/man8/faillog.8*
 
 %changelog
+* Tue Jun 26 2007 Peter Vrabec <pvrabec@redhat.com> 2:4.0.18.1-16
+- fix "CAVEATS" section of groupadd man page (#245590)
+
 * Tue Jun 06 2007 Peter Vrabec <pvrabec@redhat.com> 2:4.0.18.1-15
 - fix infinitive loop if there are duplicate entries
   in /etc/group (#240915)