diff --git a/ChangeLog b/ChangeLog
index cdeecc4f6d..584a4ac727 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-08-24  Wim Taymans  <wim@fluendo.com>
+
+	* ext/vorbis/vorbisenc.c: (gst_vorbisenc_init),
+	(gst_vorbisenc_change_state):
+	Stop leaking taglists.
+
 2005-08-24  Wim Taymans  <wim@fluendo.com>
 
 	* ext/ogg/gstoggdemux.c: (gst_ogg_pad_src_query),
diff --git a/ext/vorbis/vorbisenc.c b/ext/vorbis/vorbisenc.c
index a50316d158..7a3c0e4087 100644
--- a/ext/vorbis/vorbisenc.c
+++ b/ext/vorbis/vorbisenc.c
@@ -521,8 +521,6 @@ gst_vorbisenc_init (GstVorbisEnc * vorbisenc)
   vorbisenc->setup = FALSE;
   vorbisenc->eos = FALSE;
   vorbisenc->header_sent = FALSE;
-
-  vorbisenc->tags = gst_tag_list_new ();
 }
 
 
@@ -1099,6 +1097,8 @@ gst_vorbisenc_change_state (GstElement * element)
 
   switch (transition) {
     case GST_STATE_NULL_TO_READY:
+      vorbisenc->tags = gst_tag_list_new ();
+      break;
     case GST_STATE_READY_TO_PAUSED:
       vorbisenc->eos = FALSE;
       break;
@@ -1115,10 +1115,10 @@ gst_vorbisenc_change_state (GstElement * element)
     case GST_STATE_PAUSED_TO_READY:
       vorbisenc->setup = FALSE;
       vorbisenc->header_sent = FALSE;
-      gst_tag_list_free (vorbisenc->tags);
-      vorbisenc->tags = gst_tag_list_new ();
       break;
     case GST_STATE_READY_TO_NULL:
+      gst_tag_list_free (vorbisenc->tags);
+      vorbisenc->tags = NULL;
     default:
       break;
   }