diff --git a/ChangeLog b/ChangeLog
index 3d08e58ad8..5056d33fb2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 1998-09-05  Roland McGrath  <roland@baalperazim.frob.com>
 
+	* string/argz.h (argz_next): Add de-consting cast for return.
+
 	* sysdeps/unix/sysv/linux/Makefile [$(subdir)=inet] (sysdep_headers):
 	Don't add netinet/udp.h, netinet/ip_icmp.h here.
 	* sysdeps/gnu/Makefile: Do it here instead.
diff --git a/string/argz.h b/string/argz.h
index 49445bc3f7..cdd9c50400 100644
--- a/string/argz.h
+++ b/string/argz.h
@@ -147,7 +147,7 @@ __argz_next (__const char *__argz, size_t __argz_len, __const char *__entry)
       return __entry >= __argz + __argz_len ? (char *) NULL : (char *) __entry;
     }
   else
-    return __argz_len > 0 ? __argz : 0;
+    return __argz_len > 0 ? (char *) __argz : 0;
 }
 extern inline char *
 argz_next (__const char *__argz, size_t __argz_len, __const char *__entry)