diff --git a/ChangeLog b/ChangeLog
index b21c236881..14da8891ef 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2006-04-12  Matthias Clasen  <mclasen@redhat.com>
 
+	* gdk/x11/gdkselection-x11.c (make_list): Make this work
+	for list == NULL.  (Coverity)
+
 	* gdk/x11/gdkkeys-x11.c (gdk_keymap_get_entries_for_keycode): 
 	Rearrange the code a bit.
 
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index b21c236881..14da8891ef 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,8 @@
 2006-04-12  Matthias Clasen  <mclasen@redhat.com>
 
+	* gdk/x11/gdkselection-x11.c (make_list): Make this work
+	for list == NULL.  (Coverity)
+
 	* gdk/x11/gdkkeys-x11.c (gdk_keymap_get_entries_for_keycode): 
 	Rearrange the code a bit.
 
diff --git a/gdk/x11/gdkselection-x11.c b/gdk/x11/gdkselection-x11.c
index 9bf7e478b5..c15d1f5abf 100644
--- a/gdk/x11/gdkselection-x11.c
+++ b/gdk/x11/gdkselection-x11.c
@@ -536,10 +536,11 @@ make_list (const gchar  *text,
     }
 
   if (list)
-    *list = g_new (gchar *, n_strings + 1);
-
-  (*list)[n_strings] = NULL;
-  
+    {
+      *list = g_new (gchar *, n_strings + 1);
+      (*list)[n_strings] = NULL;
+    }
+     
   i = n_strings;
   tmp_list = strings;
   while (tmp_list)
@@ -548,10 +549,10 @@ make_list (const gchar  *text,
 	(*list)[--i] = tmp_list->data;
       else
 	g_free (tmp_list->data);
-
+      
       tmp_list = tmp_list->next;
     }
-
+  
   g_slist_free (strings);
 
   return n_strings;