diff --git a/ChangeLog b/ChangeLog
index 0bbf3466c8..2718e6b0d3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-05-30  Ulrich Drepper  <drepper@redhat.com>
+
+	* sysdeps/posix/getaddrinfo.c (gaiconf_init): Initialize bits in
+	the correct place.
+
 2006-05-29  Ulrich Drepper  <drepper@redhat.com>
 
 	* nscd/nscd.h (struct database_dyn): Add prunelock field.
@@ -8,7 +13,7 @@
 2006-05-25  Ulrich Drepper  <drepper@redhat.com>
 
 	* nis/nis_removemember.c (nis_removemember): Avoid unnecessary
-	coping.  No need to allocate new array for group members.  Just
+	copying.  No need to allocate new array for group members.  Just
 	move the pointers and update the size.
 
 	* nis/nis_addmember.c (nis_addmember): Avoid unnecessary copying.
diff --git a/sysdeps/posix/getaddrinfo.c b/sysdeps/posix/getaddrinfo.c
index a35b8662d5..185957be6a 100644
--- a/sysdeps/posix/getaddrinfo.c
+++ b/sysdeps/posix/getaddrinfo.c
@@ -1668,7 +1668,7 @@ gaiconf_init (void)
 	      if (strcmp (cmd, "label") == 0)
 		{
 		  struct in6_addr prefix;
-		  unsigned long int bits = 128;
+		  unsigned long int bits;
 		  unsigned long int val;
 		  char *endp;
 
@@ -1677,6 +1677,7 @@ gaiconf_init (void)
 		  nullbitsp = &labellist_nullbits;
 
 		new_elem:
+		  bits = 128;
 		  __set_errno (0);
 		  cp = strchr (val1, '/');
 		  if (cp != NULL)