diff --git a/ChangeLog b/ChangeLog
index 540e4cd4d..955c1239f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-01-16  Tor Lillqvist  <tml@novell.com>
+
+	* glib/gthread.c (gettime): GetSystemTimeAsFileTime() returns 100s
+	of nanoseconds, so multiply by 100 to get nanoseconds which is
+	what we want.
+
 2005-01-15  Matthias Clasen  <mclasen@redhat.com>
 
 	* configure.in: Bump version
diff --git a/glib/gthread.c b/glib/gthread.c
index ad1b77fbd..683ad4a47 100644
--- a/glib/gthread.c
+++ b/glib/gthread.c
@@ -555,6 +555,7 @@ gettime (void)
   guint64 v;
 
   GetSystemTimeAsFileTime ((FILETIME *)&v);
+  v *= 100;
 
   return v;
 #else
diff --git a/gthread/gthread-win32.c b/gthread/gthread-win32.c
index e8f1e62b9..6aead761e 100644
--- a/gthread/gthread-win32.c
+++ b/gthread/gthread-win32.c
@@ -551,6 +551,7 @@ g_gettime_win32_impl (void)
   guint64 v;
 
   GetSystemTimeAsFileTime ((FILETIME *)&v);
+  v *= 100;
 
   return v;
 }