diff --git a/ChangeLog b/ChangeLog
index 581229bb0..32cec202b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-07-26  Neil Roberts  <neil@o-hand.com>
+
+	* clutter/clutter-timeline.c (clutter_timeline_list_markers): When
+	requesting the list of markers it was returning the marker data as
+	a string instead of the name so it was copying garbage.
+
 2008-07-25  Neil Roberts  <neil@o-hand.com>
 
 	* clutter/clutter-actor.c (clutter_actor_remove_clip)
diff --git a/clutter/clutter-timeline.c b/clutter/clutter-timeline.c
index 64f8a0591..84c15a9a3 100644
--- a/clutter/clutter-timeline.c
+++ b/clutter/clutter-timeline.c
@@ -1593,7 +1593,7 @@ clutter_timeline_list_markers (ClutterTimeline *timeline,
       retval = g_new0 (gchar*, g_slist_length (markers) + 1);
 
       for (i = 0, l = markers; l != NULL; i++, l = l->next)
-        retval[i] = g_strdup (l->data);
+        retval[i] = g_strdup (((TimelineMarker *) l->data)->name);
     }
 
   if (n_markers)