diff --git a/ChangeLog b/ChangeLog
index e3b85e5df5..8ee58ed58f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-12-16  Stefan Kost  <ensonic@users.sf.net>
+
+	* gst/avi/gstavimux.c:
+	  Use new tagsetter api to flush tags.
+
 2008-12-16  Sebastian Dröge  <sebastian.droege@collabora.co.uk>
 
 	* tests/check/elements/deinterleave.c: (deinterleave_suite):
diff --git a/gst/avi/gstavimux.c b/gst/avi/gstavimux.c
index 3a9e91dcc0..c578568fb9 100644
--- a/gst/avi/gstavimux.c
+++ b/gst/avi/gstavimux.c
@@ -388,6 +388,9 @@ gst_avi_mux_reset (GstAviMux * avimux)
 
   /* state info */
   avimux->write_header = TRUE;
+
+  /* tags */
+  gst_tag_setter_flush (GST_TAG_SETTER (avimux));
 }
 
 static void
@@ -1225,7 +1228,6 @@ gst_avi_mux_riff_get_avi_header (GstAviMux * avimux)
     /* 12 bytes is needed for data header */
     GST_BUFFER_SIZE (buffer) -= 12;
     gst_tag_list_foreach (tags, gst_avi_mux_write_tag, &data);
-    /* do not free tags here, as it refers to the tag snapshot */
     GST_BUFFER_SIZE (buffer) += 12;
     buffdata = GST_BUFFER_DATA (buffer) + highmark;