diff --git a/ChangeLog b/ChangeLog
index cc8fb373a..34110251a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-12-25  Frederic Peters  <fpeters@0d.be>
+
+	* src/core/main.c: (main): added call to g_thread_init(), as ORBit2
+	stopped doing it and Metacity is using gconf; closes #565517.
+
 2008-12-24  Yanko Kaneti  <yaneti@declera.com>
 
 	* src/metacity.schemas.in.in: add screenshot commands which had
diff --git a/src/core/main.c b/src/core/main.c
index 29a7d0c62..19c2dd38a 100644
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -375,6 +375,9 @@ main (int argc, char **argv)
     "Pango", "GLib-GObject", "GThread"
   };
   guint i;
+
+  if (!g_thread_supported ())
+    g_thread_init (NULL);
   
   if (setlocale (LC_ALL, "") == NULL)
     meta_warning ("Locale not understood by C library, internationalization will not work\n");