diff --git a/ChangeLog b/ChangeLog
index 3471c47ce7..89983c3cbf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2006-10-08 Michael Emmel <mike.emmel@gmail.com>
+
+	* gdk/directfb/gdkproperty-directfb.c strdup atom name (#357611) 
+
 2006-10-08  Kristian Rietveld  <kris@gtk.org>
 
 	* gtk/gtktreeview.[ch] (gtk_tree_view_set_property),
diff --git a/gdk/directfb/gdkproperty-directfb.c b/gdk/directfb/gdkproperty-directfb.c
index aa455652cc..4536a204cd 100644
--- a/gdk/directfb/gdkproperty-directfb.c
+++ b/gdk/directfb/gdkproperty-directfb.c
@@ -191,8 +191,7 @@ gdk_atom_name (GdkAtom atom)
     
   if (GPOINTER_TO_INT (atom) >= atoms_to_names->len)
     return NULL;
-    
-  return g_ptr_array_index (atoms_to_names, GPOINTER_TO_INT (atom));
+  return g_strdup(g_ptr_array_index (atoms_to_names, GPOINTER_TO_INT (atom)));
 }