diff --git a/ChangeLog b/ChangeLog
index 8147dcfe11..030f36c744 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-02-01  Tim-Philipp Müller  <tim at centricular dot net>
+
+	* gst-libs/gst/cdda/gstcddabasesrc.c: (gst_cdda_base_src_query),
+	(gst_cdda_base_src_handle_event):
+	* gst/audiotestsrc/gstaudiotestsrc.c: (gst_audio_test_src_query):
+	  Pass unhandled queries to the parent class's query function.
+
 2006-02-01  Tim-Philipp Müller  <tim at centricular dot net>
 
 	* ext/ogg/gstoggdemux.c: (gst_ogg_pad_query_types),
diff --git a/gst-libs/gst/cdda/gstcddabasesrc.c b/gst-libs/gst/cdda/gstcddabasesrc.c
index 152f797491..21d73d7c57 100644
--- a/gst-libs/gst/cdda/gstcddabasesrc.c
+++ b/gst-libs/gst/cdda/gstcddabasesrc.c
@@ -644,8 +644,8 @@ gst_cdda_base_src_query (GstBaseSrc * basesrc, GstQuery * query)
       break;
     }
     default:{
-      GST_DEBUG_OBJECT (src, "unsupported query type");
-      return FALSE;
+      GST_DEBUG_OBJECT (src, "unhandled query, chaining up to parent class");
+      return GST_BASE_SRC_CLASS (parent_class)->query (basesrc, query);
     }
   }
 
@@ -848,14 +848,14 @@ gst_cdda_base_src_handle_event (GstBaseSrc * basesrc, GstEvent * event)
       } else {
         GST_LOG_OBJECT (src, "let base class handle seek in %s format",
             gst_format_get_name (format));
-        gst_event_ref (event);
+        event = gst_event_ref (event);
         ret = GST_BASE_SRC_CLASS (parent_class)->event (basesrc, event);
       }
       break;
     }
     default:{
       GST_LOG_OBJECT (src, "let base class handle event");
-      gst_event_ref (event);
+      event = gst_event_ref (event);
       ret = GST_BASE_SRC_CLASS (parent_class)->event (basesrc, event);
       break;
     }
diff --git a/gst/audiotestsrc/gstaudiotestsrc.c b/gst/audiotestsrc/gstaudiotestsrc.c
index ba610a6801..04ddc07baa 100644
--- a/gst/audiotestsrc/gstaudiotestsrc.c
+++ b/gst/audiotestsrc/gstaudiotestsrc.c
@@ -285,6 +285,7 @@ gst_audio_test_src_query (GstBaseSrc * basesrc, GstQuery * query)
       break;
     }
     default:
+      res = GST_BASE_SRC_CLASS (parent_class)->query (basesrc, query);
       break;
   }