diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 506a63bcd..e54075b01 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2014-02-20  Corinna Vinschen  <corinna@vinschen.de>
+
+	* grp.cc (getgrouplist): Fix previous fix so ret is only set to ngroups
+	if ngroups isn't too small.
+
 2014-02-20  Corinna Vinschen  <corinna@vinschen.de>
 
 	* grp.cc (get_groups): Don't add gid to list if it's ILLEGAL_GID.
diff --git a/winsup/cygwin/grp.cc b/winsup/cygwin/grp.cc
index 665cb173d..c82efc90b 100644
--- a/winsup/cygwin/grp.cc
+++ b/winsup/cygwin/grp.cc
@@ -624,9 +624,11 @@ getgrouplist (const char *user, gid_t gid, gid_t *groups, int *ngroups)
 	  groups[cnt] = grp->gr_gid;
 	++cnt;
       }
+  *ngroups = cnt;
   if (cnt > *ngroups)
     ret = -1;
-  ret = *ngroups = cnt;
+  else
+    ret = cnt;
 
   syscall_printf ( "%d = getgrouplist(%s, %u, %p, %d)",
 		  ret, user, gid, groups, *ngroups);