diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 21608730e..5efecd23b 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2014-05-08  Corinna Vinschen  <corinna@vinschen.de>
+
+	* grp.cc (gr_ent::enumerate_caches): Fix copy/paste bug introducing
+	an endless loop.
+
 2014-05-07  Corinna Vinschen  <corinna@vinschen.de>
 
 	* passwd.cc (pwdgrp::parse_passwd): Fix an off by one computing the
diff --git a/winsup/cygwin/grp.cc b/winsup/cygwin/grp.cc
index 3ccdbee0f..43cae6dc4 100644
--- a/winsup/cygwin/grp.cc
+++ b/winsup/cygwin/grp.cc
@@ -364,7 +364,7 @@ gr_ent::enumerate_caches ()
 	    return &grf.group ()[cnt++].g;
 	}
       cnt = 0;
-      max = 1;
+      max = 2;
       /*FALLTHRU*/
     case 2:
       if (from_db)