diff --git a/ChangeLog b/ChangeLog
index 2e878d91f3..8d30040fdc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-09-06  Jakub Jelinek  <jakub@redhat.com>
+
+	* locale/programs/ld-collate.c (collate_read): Goto sym_equiv_free
+	rather than col_sym_free.  Move seqp declaration earlier.
+
+	* resolv/gai_suspend.c (gai_suspend): Make sure result is initialized.
+
 2006-09-05  Jakub Jelinek  <jakub@redhat.com>
 
 	* nscd/initgrcache.c (addinitgroupsX): Move any_success
diff --git a/locale/programs/ld-collate.c b/locale/programs/ld-collate.c
index e69ac85a95..a1401013e0 100644
--- a/locale/programs/ld-collate.c
+++ b/locale/programs/ld-collate.c
@@ -3068,7 +3068,7 @@ collate_read (struct linereader *ldfile, struct localedef_t *result,
 		  lr_error (ldfile, _("\
 %s: unknown symbol `%s' in equivalent definition"),
 			    "LC_COLLATE", symname);
-		  goto col_sym_free;
+		  goto sym_equiv_free;
 		}
 
 	      if (insert_entry (&collate->sym_table,
@@ -3533,13 +3533,13 @@ error while adding equivalent collating symbol"));
 	      break;
 	    }
 
+	  struct element_t *seqp;
 	  if (state == 0)
 	    {
 	      /* We are outside an `order_start' region.  This means
                  we must only accept definitions of values for
                  collation symbols since these are purely abstract
                  values and don't need directions associated.  */
-	      struct element_t *seqp;
 	      void *ptr;
 
 	      if (find_entry (&collate->seq_table, symstr, symlen, &ptr) == 0)
@@ -3586,7 +3586,6 @@ error while adding equivalent collating symbol"));
 	    {
 	      /* It is possible that we already have this collation sequence.
 		 In this case we move the entry.  */
-	      struct element_t *seqp = NULL;
 	      void *sym;
 	      void *ptr;
 
diff --git a/resolv/gai_suspend.c b/resolv/gai_suspend.c
index c2095124b7..4d85ac2c10 100644
--- a/resolv/gai_suspend.c
+++ b/resolv/gai_suspend.c
@@ -83,6 +83,7 @@ gai_suspend (const struct gaicb *const list[], int ent,
       pthread_setcancelstate (PTHREAD_CANCEL_DISABLE, &oldstate);
 
 #ifdef DONT_NEED_GAI_MISC_COND
+      result = 0;
       GAI_MISC_WAIT (result, cntr, timeout, 1);
 #else
       if (timeout == NULL)