diff --git a/ChangeLog b/ChangeLog
index 77803a37d..3f5e57c51 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2008-06-15  Emmanuele Bassi  <ebassi@openedhand.com>
+
+	Bug #967 - Mismatch of Timeline::marker-reached signal signature
+
+	* clutter/clutter-marshal.list:
+	* clutter/clutter-timeline.c:
+	(clutter_timeline_class_init): Fix the type of the frame_num
+	argument in the ::marker-reached signal creation to match the
+	signal class handler. (Armin Burgmeier)
+
 2008-06-14  Emmanuele Bassi  <ebassi@openedhand.com>
 
 	* README: We depend on PangoCairo, now; also add all the missing
diff --git a/clutter/clutter-marshal.list b/clutter/clutter-marshal.list
index 6bfb8ccd1..b83857fe3 100644
--- a/clutter/clutter-marshal.list
+++ b/clutter/clutter-marshal.list
@@ -9,5 +9,5 @@ VOID:OBJECT
 VOID:OBJECT,OBJECT,PARAM
 VOID:OBJECT,POINTER
 VOID:STRING,BOOLEAN,BOOLEAN
-VOID:STRING,UINT
+VOID:STRING,INT
 VOID:VOID
diff --git a/clutter/clutter-timeline.c b/clutter/clutter-timeline.c
index dd58bb517..a575b2fc6 100644
--- a/clutter/clutter-timeline.c
+++ b/clutter/clutter-timeline.c
@@ -552,10 +552,10 @@ clutter_timeline_class_init (ClutterTimelineClass *klass)
                   G_SIGNAL_RUN_LAST | G_SIGNAL_NO_RECURSE | G_SIGNAL_DETAILED | G_SIGNAL_NO_HOOKS,
                   G_STRUCT_OFFSET (ClutterTimelineClass, marker_reached),
                   NULL, NULL,
-                  clutter_marshal_VOID__STRING_UINT,
+                  clutter_marshal_VOID__STRING_INT,
                   G_TYPE_NONE, 2,
                   G_TYPE_STRING,
-                  G_TYPE_UINT);
+                  G_TYPE_INT);
 }
 
 static void