diff --git a/ChangeLog b/ChangeLog
index c2e1027a4..74d806a65 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-08-08  Emmanuele Bassi  <ebassi@openedhand.com>
+
+	* clutter/clutter-main.c (clutter_get_timestamp): Return the
+	correct number of microseconds (#447, Neil Roberts)
+
 2007-08-08  Emmanuele Bassi  <ebassi@openedhand.com>
 
 	Merge the clutter.git/threading branch.
diff --git a/clutter/clutter-main.c b/clutter/clutter-main.c
index 889443489..4db381b03 100644
--- a/clutter/clutter-main.c
+++ b/clutter/clutter-main.c
@@ -670,14 +670,15 @@ clutter_get_timestamp (void)
 {
 #ifdef CLUTTER_ENABLE_DEBUG
   ClutterMainContext *ctx;
-  gdouble             seconds;
+  gdouble seconds;
+  gulong msecs;
 
   ctx = clutter_context_get_default ();
 
   /* FIXME: may need a custom timer for embedded setups */
-  seconds = g_timer_elapsed (ctx->timer, NULL);
+  seconds = g_timer_elapsed (ctx->timer, &msecs);
 
-  return (gulong)(seconds / 0.0000001);
+  return (gulong)(seconds / 1.0e-6) + msecs;
 #else
   return 0;
 #endif