diff --git a/ChangeLog b/ChangeLog
index 0db4ff435a..454c392b55 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-08-28  Edward Hervey  <edward.hervey@collabora.co.uk>
+
+	* ext/ffmpeg/gstffmpegcodecmap.c: (gst_ff_aud_caps_new):
+	ffmpeg audio decoders can now do up to 6 channels... and actually
+	expose it properly. Don't expect any channel mapping though.
+
 2008-08-28  Edward Hervey  <edward.hervey@collabora.co.uk>
 
 	* configure.ac:
diff --git a/ext/ffmpeg/gstffmpegcodecmap.c b/ext/ffmpeg/gstffmpegcodecmap.c
index 872648ca08..b25cdb9e56 100644
--- a/ext/ffmpeg/gstffmpegcodecmap.c
+++ b/ext/ffmpeg/gstffmpegcodecmap.c
@@ -171,7 +171,7 @@ gst_ff_aud_caps_new (AVCodecContext * context, enum CodecID codec_id,
   } else {
     caps = gst_caps_new_simple (mimetype,
         "rate", GST_TYPE_INT_RANGE, 8000, 96000,
-        "channels", GST_TYPE_INT_RANGE, 1, 2, NULL);
+        "channels", GST_TYPE_INT_RANGE, 1, 6, NULL);
 
   }