diff --git a/ChangeLog b/ChangeLog
index 27cb03cc4c..eeb46e3b84 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,9 @@
 
 2006-10-02  Dmitry V. Levin  <ldv@altlinux.org>
 
+	* sysdeps/posix/getaddrinfo.c (match_prefix): Make mask and val
+	variables const to avoid compiler warnings.
+
 	* io/fts.c (fts_close): Remove redundant checks.
 	(fts_build): Likewise.
 	(fts_palloc): Likewise.
diff --git a/sysdeps/posix/getaddrinfo.c b/sysdeps/posix/getaddrinfo.c
index dd5a57d9e0..9387e20db2 100644
--- a/sysdeps/posix/getaddrinfo.c
+++ b/sysdeps/posix/getaddrinfo.c
@@ -1291,8 +1291,8 @@ match_prefix (const struct sockaddr_storage *ss,
   for (idx = 0; ; ++idx)
     {
       unsigned int bits = list[idx].bits;
-      uint8_t *mask = list[idx].prefix.s6_addr;
-      uint8_t *val = in6->sin6_addr.s6_addr;
+      const uint8_t *mask = list[idx].prefix.s6_addr;
+      const uint8_t *val = in6->sin6_addr.s6_addr;
 
       while (bits >= 8)
 	{