diff --git a/ChangeLog b/ChangeLog
index 22e48517c4..eeb82a62c5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-10-08  Wim Taymans  <wim.taymans@collabora.co.uk>
+
+	* gst/avi/gstavidemux.c: (gst_avi_demux_reset),
+	(gst_avi_demux_parse_subindex), (gst_avi_demux_parse_index):
+	Reset header state. Fixes #555321.
+
 2008-10-08  Wim Taymans  <wim.taymans@collabora.co.uk>
 
 	* gst/avi/gstavidemux.c: (gst_avi_demux_parse_subindex),
diff --git a/gst/avi/gstavidemux.c b/gst/avi/gstavidemux.c
index a0b4741280..255f5353ea 100644
--- a/gst/avi/gstavidemux.c
+++ b/gst/avi/gstavidemux.c
@@ -239,6 +239,7 @@ gst_avi_demux_reset (GstAviDemux * avi)
   }
   memset (&avi->stream, 0, sizeof (avi->stream));
 
+  avi->header_state = GST_AVI_DEMUX_HEADER_TAG_LIST;
   avi->num_streams = 0;
   avi->num_v_streams = 0;
   avi->num_a_streams = 0;