diff --git a/ChangeLog b/ChangeLog
index 5abd780cf6..f1fbcf7f0e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-07-12  Edward Hervey  <edward@fluendo.com>
+
+	* ext/vorbis/vorbisdec.c: (vorbis_dec_finalize):
+	Reset the decoder in finalize so that all fields get cleared.
+
 2006-07-12  Wim Taymans  <wim@fluendo.com>
 
 	* gst-libs/gst/audio/gstbaseaudiosrc.c:
diff --git a/ext/vorbis/vorbisdec.c b/ext/vorbis/vorbisdec.c
index b5f5913a11..2d75c8784e 100644
--- a/ext/vorbis/vorbisdec.c
+++ b/ext/vorbis/vorbisdec.c
@@ -98,6 +98,8 @@ static gboolean vorbis_dec_convert (GstPad * pad,
 
 static gboolean vorbis_dec_sink_query (GstPad * pad, GstQuery * query);
 
+static void gst_vorbis_dec_reset (GstVorbisDec * dec);
+
 static void
 gst_vorbis_dec_base_init (gpointer g_class)
 {
@@ -181,6 +183,8 @@ vorbis_dec_finalize (GObject * object)
   vorbis_comment_clear (&vd->vc);
   vorbis_info_clear (&vd->vi);
 
+  gst_vorbis_dec_reset (vd);
+
   G_OBJECT_CLASS (parent_class)->finalize (object);
 }