diff --git a/ChangeLog b/ChangeLog
index 8e4068dbdc..3757dc66ed 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-01-09  Ronald S. Bultje  <rbultje@ronald.bitfreak.net>
+
+	* gst/playback/gstplaybasebin.c: (setup_source):
+	  Set source to NULL so that resources are free'ed. Fixes issues
+	  with playback of CDDA and similar device-accessing things.
+
 2005-01-09  Ronald S. Bultje  <rbultje@ronald.bitfreak.net>
 
 	* testsuite/embed/Makefile.am:
diff --git a/gst/playback/gstplaybasebin.c b/gst/playback/gstplaybasebin.c
index a3cedd0ade..b106530995 100644
--- a/gst/playback/gstplaybasebin.c
+++ b/gst/playback/gstplaybasebin.c
@@ -1096,6 +1096,7 @@ setup_source (GstPlayBaseBin * play_base_bin, GError ** error)
   } else {
     if (old_src) {
       GST_LOG ("removing old src element %s", gst_element_get_name (old_src));
+      gst_element_set_state (old_src, GST_STATE_NULL);
       gst_bin_remove (GST_BIN (play_base_bin->thread), old_src);
     }
     gst_bin_add (GST_BIN (play_base_bin->thread), play_base_bin->source);