diff --git a/winsup/utils/ChangeLog b/winsup/utils/ChangeLog
index 465730823..dbf5b5035 100644
--- a/winsup/utils/ChangeLog
+++ b/winsup/utils/ChangeLog
@@ -1,3 +1,7 @@
+2011-02-28  Corinna Vinschen  <corinna@vinschen.de>
+
+	* setfacl.c (strchrnul): Drop local implementation.
+
 2011-02-15  Corinna Vinschen  <corinna@vinschen.de>
 
 	* cygcheck.cc: Fix copyright dates.
diff --git a/winsup/utils/setfacl.c b/winsup/utils/setfacl.c
index f04cf2510..35689890c 100644
--- a/winsup/utils/setfacl.c
+++ b/winsup/utils/setfacl.c
@@ -1,6 +1,6 @@
 /* setfacl.c
 
-   Copyright 2000, 2001, 2002, 2003, 2006, 2008, 2009, 2010 Red Hat Inc.
+   Copyright 2000, 2001, 2002, 2003, 2006, 2008, 2009, 2010, 2011 Red Hat Inc.
 
    Written by Corinna Vinschen <vinschen@redhat.com>
 
@@ -71,16 +71,6 @@ mode_t getperm (char *in)
          | (in[2] == 'x' ? S_IXOTH : 0);
 }
 
-/* GNU extension.  Like strchr except that if c is not found, return pointer
-   to the trailing \0, rather than NULL. */
-static char *
-strchrnul (const char *s, int c)
-{
-  while (*s && *s != c)
-    ++s;
-  return (char *) s;
-}
-
 BOOL
 getaclentry (action_t action, char *c, aclent_t *ace)
 {