diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 24b18118009..bf08a13a0d1 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+Tue Mar 28 12:23:37 2000  Philippe De Muyter  <phdm@macqel.be>
+
+	* gnu-regex.c (regerror): Function renamed from `__regerror'.
+	(Change also approved in the mainline glibc sources)
+
 Tue Mar 28 18:19:50 2000  Andrew Cagney  <cagney@b1.cygnus.com>
 
 	From 2000-03-20 Jonathan Larmour <jlarmour@redhat.co.uk>:
diff --git a/gdb/gnu-regex.c b/gdb/gnu-regex.c
index 632c6eaf554..f7faa8c8647 100644
--- a/gdb/gnu-regex.c
+++ b/gdb/gnu-regex.c
@@ -5730,7 +5730,7 @@ weak_alias (__regexec, regexec)
    from either regcomp or regexec.   We don't use PREG here.  */
 
 size_t
-__regerror (errcode, preg, errbuf, errbuf_size)
+regerror (errcode, preg, errbuf, errbuf_size)
     int errcode;
     const regex_t *preg;
     char *errbuf;