diff --git a/ChangeLog b/ChangeLog
index 09cc7fdecc..f92e740782 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-02-13  Tim-Philipp Müller  <tim at centricular dot net>
+
+	* gst-libs/gst/cdda/gstcddabasesrc.c: (gst_cdda_base_src_create):
+	  No need to push an EOS event here, GstBaseSrc will do that for us
+	  when we return FLOW_UNEXPECTED.
+	  
 2006-02-12  Wim Taymans  <wim@fluendo.com>
 
 	* gst-libs/gst/audio/gstbaseaudiosink.c:
diff --git a/common b/common
index 58567e5519..c30611ac38 160000
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit 58567e5519f2d00a4592491db1a6e8302993279e
+Subproject commit c30611ac38336030fed6d258c6e558cc537adbc5
diff --git a/gst-libs/gst/cdda/gstcddabasesrc.c b/gst-libs/gst/cdda/gstcddabasesrc.c
index 21d73d7c57..192fe32e9b 100644
--- a/gst-libs/gst/cdda/gstcddabasesrc.c
+++ b/gst-libs/gst/cdda/gstcddabasesrc.c
@@ -1491,7 +1491,7 @@ gst_cdda_base_src_create (GstPushSrc * pushsrc, GstBuffer ** buffer)
     src->prev_track = -1;
     GST_DEBUG_OBJECT (src, "EOS at sector %d, cur_track=%d, mode=%d",
         src->cur_sector, src->cur_track, src->mode);
-    gst_pad_push_event (GST_BASE_SRC_PAD (src), gst_event_new_eos ());
+    /* base class will send EOS for us */
     return GST_FLOW_UNEXPECTED;
   }