diff --git a/ChangeLog b/ChangeLog
index 31fbcf459..9306dfc6f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-10-18  Øyvind Kolås  <pippin@o-hand.com>
+
+	* clutter/clutter-timeline.c: (clutter_timeline_set_duration):
+	rearranged arithemetic to allow specifying duration with sub second
+	precision (also enables durations smaller than one second).
+
 2007-10-18  Emmanuele Bassi  <ebassi@openedhand.com>
 
 	* clutter/clutter-script-private.h:
diff --git a/clutter/clutter-timeline.c b/clutter/clutter-timeline.c
index 51a25d2e7..9fc6a1637 100644
--- a/clutter/clutter-timeline.c
+++ b/clutter/clutter-timeline.c
@@ -1044,8 +1044,7 @@ clutter_timeline_set_duration (ClutterTimeline *timeline,
 
       priv->duration = msecs;
 
-      priv->n_frames = priv->duration / 1000
-                       * priv->fps;
+      priv->n_frames = priv->duration * priv->fps / 1000;
 
       g_object_notify (G_OBJECT (timeline), "num-frames");
       g_object_notify (G_OBJECT (timeline), "duration");