diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 40346f669..907f46b8c 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2008-10-09  Corinna Vinschen  <corinna@vinschen.de>
+
+	* grp.cc (pwdgrp::read_group): Generate more speaking group name
+	if passwd gid exists under different gid in /etc/group.
+
 2008-10-09  Corinna Vinschen  <corinna@vinschen.de>
 
 	* path.cc (path_conv::is_binary): Always check for GetBinaryType.
diff --git a/winsup/cygwin/grp.cc b/winsup/cygwin/grp.cc
index a007ae657..d9fe4f343 100644
--- a/winsup/cygwin/grp.cc
+++ b/winsup/cygwin/grp.cc
@@ -84,7 +84,8 @@ pwdgrp::read_group ()
 
       cygheap->user.groups.pgsid.string (strbuf);
       if ((gr = internal_getgrsid (cygheap->user.groups.pgsid)))
-	strlcpy (group_name, gr->gr_name, sizeof (group_name));
+	snprintf (group_name, sizeof (group_name),
+		  "passwd/group_GID_clash(%lu/%lu)", myself->gid, gr->gr_gid);
       if (myself->uid == UNKNOWN_UID)
 	strcpy (group_name, "mkpasswd"); /* Feedback... */
       snprintf (linebuf, sizeof (linebuf), "%s:%s:%lu:%s",