diff --git a/ChangeLog b/ChangeLog
index a96e1654e2..411c7c30ea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-07-08  Sebastian Dröge  <sebastian.droege@collabora.co.uk>
+
+	* gst/gstchildproxy.c: (gst_child_proxy_base_init):
+	Add FIXMEs for 0.11 to use GST_TYPE_OBJECT in the signature
+	of the the child-added / -removed signals as GstChildProxy
+	only supports GstObjects.
+
 2008-07-07  Thijs Vermeir  <thijsvermeir@gmail.com>
 
 	* gst/gstdebugutils.c:
diff --git a/gst/gstchildproxy.c b/gst/gstchildproxy.c
index 596157922e..f72b01e25d 100644
--- a/gst/gstchildproxy.c
+++ b/gst/gstchildproxy.c
@@ -449,6 +449,8 @@ gst_child_proxy_base_init (gpointer g_class)
 	 *
 	 * Will be emitted after the @object was added to the @child_proxy.
 	 */
+    /* FIXME 0.11: use GST_TYPE_OBJECT as GstChildProxy only
+     * supports GstObjects */
     signals[CHILD_ADDED] =
         g_signal_new ("child-added", G_TYPE_FROM_CLASS (g_class),
         G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GstChildProxyInterface,
@@ -462,6 +464,8 @@ gst_child_proxy_base_init (gpointer g_class)
 	 *
 	 * Will be emitted after the @object was removed from the @child_proxy.
 	 */
+    /* FIXME 0.11: use GST_TYPE_OBJECT as GstChildProxy only
+     * supports GstObjects */
     signals[CHILD_REMOVED] =
         g_signal_new ("child-removed", G_TYPE_FROM_CLASS (g_class),
         G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GstChildProxyInterface,