diff --git a/ChangeLog b/ChangeLog
index 942c1b77f3..d606fc4510 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-03-08  Ronald Bultje  <rbultje@ronald.bitfreak.net>
+
+	* gst-libs/gst/riff/riff-read.c: (gst_riff_read_info):
+	  Fix metadata read crash (#136537).
+
 2004-03-08  Thomas Vander Stichele  <thomas at apestaart dot org>
 
 	* gst-libs/gst/media-info/media-info-priv.c: (gmi_set_mime):
diff --git a/gst-libs/gst/riff/riff-read.c b/gst-libs/gst/riff/riff-read.c
index 40fc4005b8..6f282c5171 100644
--- a/gst-libs/gst/riff/riff-read.c
+++ b/gst-libs/gst/riff/riff-read.c
@@ -830,7 +830,6 @@ gst_riff_read_info (GstRiffRead *riff)
     gst_event_unref (event);
     gst_element_found_tags (GST_ELEMENT (riff), taglist);
   }
-  gst_tag_list_free (taglist);
 
   return TRUE;
 }