diff --git a/ChangeLog b/ChangeLog
index 8f9b76c888..b357840d8c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-03-04  Jan Schmidt  <thaytan@mad.scientist.com>
+
+	* ext/cdio/gstcdiocddasrc.c: (gst_cdio_cdda_src_open),
+	(gst_cdio_cdda_src_finalize):
+	Make sure we always destroy our libcdio handle.
+
 2007-03-04  Jan Schmidt  <thaytan@mad.scientist.com>
 
 	* tests/check/Makefile.am:
diff --git a/ext/cdio/gstcdiocddasrc.c b/ext/cdio/gstcdiocddasrc.c
index 0e8967ea61..ca3258eeca 100644
--- a/ext/cdio/gstcdiocddasrc.c
+++ b/ext/cdio/gstcdiocddasrc.c
@@ -287,6 +287,9 @@ not_audio:
   {
     GST_ELEMENT_ERROR (src, RESOURCE, OPEN_READ,
         (_("Disc is not an Audio CD.")), ("discmode: %d", (gint) discmode));
+
+    cdio_destroy (src->cdio);
+    src->cdio = NULL;
     return FALSE;
   }
 }
@@ -312,6 +315,13 @@ gst_cdio_cdda_src_init (GstCdioCddaSrc * src, GstCdioCddaSrcClass * klass)
 static void
 gst_cdio_cdda_src_finalize (GObject * obj)
 {
+  GstCdioCddaSrc *src = GST_CDIO_CDDA_SRC (obj);
+
+  if (src->cdio) {
+    cdio_destroy (src->cdio);
+    src->cdio = NULL;
+  }
+
   G_OBJECT_CLASS (parent_class)->finalize (obj);
 }