diff --git a/ChangeLog b/ChangeLog
index b54de7f0fc..91f6fdda43 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-07-18  Wim Taymans  <wim@fluendo.com>
+
+	* gst/rtsp/gstrtspsrc.c: (gst_rtspsrc_add_element),
+	(gst_rtspsrc_play):
+	Fix for core changes.
+
 2005-07-18  Jan Schmidt  <thaytan@mad.scientist.com>
 
 	* ext/mad/gstid3tag.c: (gst_id3_tag_sink_event):
diff --git a/common b/common
index ac7272b7af..6f9b691adc 160000
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit ac7272b7af934c2294a44ac1c0f3fac3f8d17ec6
+Subproject commit 6f9b691adc2a0300598311671dd7c4d9d2035afa
diff --git a/gst/rtsp/gstrtspsrc.c b/gst/rtsp/gstrtspsrc.c
index a522e357d7..fea449fe8c 100644
--- a/gst/rtsp/gstrtspsrc.c
+++ b/gst/rtsp/gstrtspsrc.c
@@ -244,8 +244,6 @@ static gboolean
 gst_rtspsrc_add_element (GstRTSPSrc * src, GstElement * element)
 {
   gst_object_set_parent (GST_OBJECT (element), GST_OBJECT (src));
-  gst_element_set_manager (element, GST_ELEMENT_MANAGER (src));
-  gst_element_set_scheduler (element, GST_ELEMENT_SCHEDULER (src));
 
   return TRUE;
 }
@@ -795,10 +793,8 @@ gst_rtspsrc_play (GstRTSPSrc * src)
   if (!gst_rtspsrc_send (src, &request, &response))
     goto send_error;
 
-  if (GST_ELEMENT_SCHEDULER (src) && src->interleaved) {
-    src->task =
-        gst_scheduler_create_task (GST_ELEMENT_SCHEDULER (src),
-        (GstTaskFunction) gst_rtspsrc_loop, src);
+  if (src->interleaved) {
+    src->task = gst_task_create ((GstTaskFunction) gst_rtspsrc_loop, src);
 
     gst_task_start (src->task);
   }