diff --git a/ChangeLog b/ChangeLog
index 43a4836ba5..5327fdc27c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-05-14  Stephane Loeuillet <stephane.loeuillet@tiscali.fr>
+
+	* gst-libs/gst/riff/riff-read.c :
+	  - fix INFO tag extraction in RIFF/AVI files
+            because gst_event_unref (event) also freed taglist
+          - avoid a mem leak
+
 2004-05-13  Stephane Loeuillet <stephane.loeuillet@tiscali.fr>
 
 	* ext/mad/gstid3tag.c : move from "Codec/(Dem/M)uxer" to "Codec/(Dem/M)uxer/Audio"
diff --git a/gst-libs/gst/riff/riff-read.c b/gst-libs/gst/riff/riff-read.c
index fc47f2c83e..0e441ba8bf 100644
--- a/gst-libs/gst/riff/riff-read.c
+++ b/gst-libs/gst/riff/riff-read.c
@@ -879,8 +879,12 @@ gst_riff_read_info (GstRiffRead * riff)
         gst_pad_push (GST_PAD (padlist->data), GST_DATA (event));
       }
     }
+
+    gst_element_found_tags (element, taglist);
+
     gst_event_unref (event);
-    gst_element_found_tags (GST_ELEMENT (riff), taglist);
+  } else {
+    gst_tag_list_free (taglist);
   }
 
   return TRUE;