diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 0cf1196df..aa2494298 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2014-02-12  Corinna Vinschen  <corinna@vinschen.de>
+
+	* uinfo.cc (cygheap_pwdgrp::nss_init_line): Explicitely ignore a colon
+	as separator char.
+
 2014-02-11  Christopher Faylor  <me.cygwin2014@cgf.cx>
 
 	* winsup.h: Turn off previous workaround but leave a comment.
diff --git a/winsup/cygwin/uinfo.cc b/winsup/cygwin/uinfo.cc
index 38e222d92..f207de577 100644
--- a/winsup/cygwin/uinfo.cc
+++ b/winsup/cygwin/uinfo.cc
@@ -646,7 +646,7 @@ cygheap_pwdgrp::nss_init_line (const char *line)
 	{
 	  c += 10;
 	  c += strspn (c, " \t");
-	  if ((unsigned char) *c <= 0x7f && strchr (" \t", c[1]))
+	  if ((unsigned char) *c <= 0x7f && *c != ':' && strchr (" \t", c[1]))
 	    separator[0] = (unsigned char) *c;
 	  else
 	    debug_printf ("Invalid nsswitch.conf content: %s", line);