diff --git a/ChangeLog b/ChangeLog
index 08c515168c..6fd7911f04 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-04-28  Sebastian Dröge  <slomo@circular-chaos.org>
+
+	* gst/gst.c:
+	Register GstClock type from a type-safe context. Fixes bug #530317.
+
 2008-04-25  Michael Smith <msmith@songbirdnest.com>
 
 	Patch by Edward Hervey <edward.hervey@collabora.co.uk>
diff --git a/gst/gst.c b/gst/gst.c
index 9006cc773e..5df4955780 100644
--- a/gst/gst.c
+++ b/gst/gst.c
@@ -985,6 +985,7 @@ init_post (GOptionContext * context, GOptionGroup * group, gpointer data,
   g_type_class_ref (gst_bin_get_type ());
   g_type_class_ref (gst_bus_get_type ());
   g_type_class_ref (gst_task_get_type ());
+  g_type_class_ref (gst_clock_get_type ());
 
 #ifndef GST_DISABLE_INDEX
   g_type_class_ref (gst_index_factory_get_type ());