diff --git a/ChangeLog b/ChangeLog
index 9b9084b471..7821629779 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-05-01  Richard Hult  <richard@imendio.com>
+
+	* gtk/gtkquartz.c (_gtk_quartz_set_selection_data_for_pasteboard):
+	Prevent crash, fixes bug #530153. Patch from Yevgen Muntyan.
+
 2008-05-01  Matthias Clasen  <mclasen@redhat.com>
 
 	* modules/imput/imthai.c: Register the right translation domain.
diff --git a/gtk/gtkquartz.c b/gtk/gtkquartz.c
index 7e41309265..5cee427204 100644
--- a/gtk/gtkquartz.c
+++ b/gtk/gtkquartz.c
@@ -283,7 +283,7 @@ _gtk_quartz_set_selection_data_for_pasteboard (NSPasteboard *pasteboard,
     }
   else if ([type isEqualTo:NSURLPboardType])
     {
-      gchar **list;
+      gchar **list = NULL;
       gchar **result = NULL;
       NSURL *url;