diff --git a/ChangeLog b/ChangeLog
index bce3ee2d16..b1b15343f4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-11-01  Tim-Philipp Müller  <tim at centricular dot net>
+
+	* gst/gstformat.c: (_gst_format_initialize):
+	  g_type_class_ref() our GstFormat type to make sure we avoid the
+	  thread-unsafe bits of the GObject/GType system, ie. bug #349410 and
+	  bug #64764. Should fix intermittent tee unit test failures (#474823).
+
 2007-11-01  Tim-Philipp Müller  <tim at centricular dot net>
 
 	* tests/check/elements/tee.c: (test_num_buffers):
diff --git a/gst/gstformat.c b/gst/gstformat.c
index b047c1c654..ea02d998f0 100644
--- a/gst/gstformat.c
+++ b/gst/gstformat.c
@@ -74,7 +74,7 @@ _gst_format_initialize (void)
     _n_values++;
   }
   /* getting the type registers the enum */
-  gst_format_get_type ();
+  g_type_class_ref (gst_format_get_type ());
   g_static_mutex_unlock (&mutex);
 }