diff --git a/ChangeLog b/ChangeLog
index 88fe4f9053..2694189635 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-05-11  Wim Taymans  <wim@fluendo.com>
+
+	* gst/gstbuffer.c: (_gst_buffer_initialize):
+	Register subbufer along with the buffer type so that
+	it does not accidentally gets registered from N
+	different streaming threads in a non threadsafe way.
+
 2006-05-10  Tim-Philipp Müller  <tim at centricular dot net>
 
 	* gst/gstbuffer.h:
diff --git a/gst/gstbuffer.c b/gst/gstbuffer.c
index 8408c2981a..ab15c72f42 100644
--- a/gst/gstbuffer.c
+++ b/gst/gstbuffer.c
@@ -121,7 +121,7 @@ static void gst_buffer_init (GTypeInstance * instance, gpointer g_class);
 static void gst_buffer_class_init (gpointer g_class, gpointer class_data);
 static void gst_buffer_finalize (GstBuffer * buffer);
 static GstBuffer *_gst_buffer_copy (GstBuffer * buffer);
-
+static GType gst_subbuffer_get_type (void);
 
 void
 _gst_buffer_initialize (void)
@@ -129,6 +129,7 @@ _gst_buffer_initialize (void)
   gpointer ptr;
 
   gst_buffer_get_type ();
+  gst_subbuffer_get_type ();
 
   /* the GstMiniObject types need to be class_ref'd once before it can be
    * done from multiple threads;