diff --git a/libidn/ChangeLog b/libidn/ChangeLog
index 1903cab566..17e00a6113 100644
--- a/libidn/ChangeLog
+++ b/libidn/ChangeLog
@@ -1,3 +1,9 @@
+2004-03-14  Ulrich Drepper  <drepper@redhat.com>
+
+	* idn-stub.c (__idna_to_unicode_lzlz): Use __strchrnul, not strchrnul.
+
+	* idna.c (idna_to_ascii_4z): Revert last patch.
+
 2004-03-12  Ulrich Drepper  <drepper@redhat.com>
 
 	* idna.c (idna_to_ascii_4z): Use strdup if available.  Unify two ifs.
diff --git a/libidn/idn-stub.c b/libidn/idn-stub.c
index 7f5d22e5aa..13cd4db5c2 100644
--- a/libidn/idn-stub.c
+++ b/libidn/idn-stub.c
@@ -83,7 +83,7 @@ __idna_to_unicode_lzlz (const char *input, char **output, int flags)
 	break;
 
       /* On to the next part of the name.  */
-      cp = strchrnul (cp, '.');
+      cp = __strchrnul (cp, '.');
       if (*cp == '.')
 	++cp;
     }