diff --git a/ChangeLog b/ChangeLog
index 0fbd2c1817c526ab9fe4f1fdbef366f95f406613..3847878db69e5918ed89314800b173e8e6b5ce5b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2005-02-20  Tim-Philipp Müller  <tim at centricular dot net>
+
+	* gst-libs/gst/riff/riff-media.c:
+	(gst_riff_create_audio_caps_with_data):
+	  Do actually fix invalid RIFF fmt header values for alaw
+	  and mulaw audio instead of just saying so.
+
+	* gst/wavparse/gstwavparse.c: (gst_wavparse_fmt):
+	  Give gst_riff_create_audio_caps_with_data() a chance to
+	  fix up broken format header fields before extracting any
+	  parameters from the header. (fixes #167633)
+
 2005-02-19  Martin Holters  <martin.holters@gmx.de>
 
 	Reviewed by: Tim-Philipp Müller  <tim at centricular dot net>
diff --git a/gst/wavparse/gstwavparse.c b/gst/wavparse/gstwavparse.c
index b708cee4a139a2cff8b1dd8a13f3047d90214335..4c343dcb49e14197ee33bb688cd6efa38e17ec23 100644
--- a/gst/wavparse/gstwavparse.c
+++ b/gst/wavparse/gstwavparse.c
@@ -545,6 +545,10 @@ gst_wavparse_fmt (GstWavParse * wav)
     return FALSE;
   }
 
+  /* Note: gst_riff_create_audio_caps might nedd to fix values in
+   * the header header depending on the format, so call it first */
+  caps = gst_riff_create_audio_caps (header->format, NULL, header, NULL);
+
   wav->format = header->format;
   wav->rate = header->rate;
   wav->channels = header->channels;
@@ -553,7 +557,6 @@ gst_wavparse_fmt (GstWavParse * wav)
   wav->depth = header->size;
   wav->bps = header->av_bps;
 
-  caps = gst_riff_create_audio_caps (header->format, NULL, header, NULL);
   g_free (header);
 
   if (caps) {