diff --git a/ChangeLog b/ChangeLog
index 4fda804d86..b72a1f0147 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2006-04-24  Ulrich Drepper  <drepper@redhat.com>
+
+	* sysdeps/posix/getaddrinfo.c (getaddrinfo): Always initialize in6ai.
+
 2006-04-24  Jakub Jelinek  <jakub@redhat.com>
 
 	* sysdeps/unix/sysv/linux/sync_file_range.c (sync_file_range): Use
diff --git a/sysdeps/posix/getaddrinfo.c b/sysdeps/posix/getaddrinfo.c
index 843e60bba3..e4fea334ca 100644
--- a/sysdeps/posix/getaddrinfo.c
+++ b/sysdeps/posix/getaddrinfo.c
@@ -1516,7 +1516,7 @@ getaddrinfo (const char *name, const char *service,
   if ((hints->ai_flags & AI_CANONNAME) && name == NULL)
     return EAI_BADFLAGS;
 
-  struct in6addrinfo *in6ai;
+  struct in6addrinfo *in6ai = NULL;
   size_t in6ailen;
   bool seen_ipv4 = false;
   bool seen_ipv6 = false;