diff --git a/ChangeLog b/ChangeLog
index 484c139ae1..a5cbdee0fa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2011-10-10  Andreas Schwab  <schwab@linux-m68k.org>
 
+	* inet/getnetgrent_r.c (nscd_getnetgrent): Use __rawmemchr instead
+	of rawmemchr.
+
 	* sysdeps/ieee754/ldbl-128ibm/s_isinf_nsl.c: New file.
 
 2011-10-09  Ulrich Drepper  <drepper@gmail.com>
diff --git a/inet/getnetgrent_r.c b/inet/getnetgrent_r.c
index 87903877bf..197dd37a5d 100644
--- a/inet/getnetgrent_r.c
+++ b/inet/getnetgrent_r.c
@@ -250,11 +250,11 @@ nscd_getnetgrent (struct __netgrent *datap, char *buffer, size_t buflen,
 
   datap->type = triple_val;
   datap->val.triple.host = datap->cursor;
-  datap->cursor = (char *) rawmemchr (datap->cursor, '\0') + 1;
+  datap->cursor = (char *) __rawmemchr (datap->cursor, '\0') + 1;
   datap->val.triple.user = datap->cursor;
-  datap->cursor = (char *) rawmemchr (datap->cursor, '\0') + 1;
+  datap->cursor = (char *) __rawmemchr (datap->cursor, '\0') + 1;
   datap->val.triple.domain = datap->cursor;
-  datap->cursor = (char *) rawmemchr (datap->cursor, '\0') + 1;
+  datap->cursor = (char *) __rawmemchr (datap->cursor, '\0') + 1;
 
   return NSS_STATUS_SUCCESS;
 }