diff --git a/ChangeLog b/ChangeLog
index 6b9b7c21ed..9a591c5747 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-05-20  Sebastian Dröge  <slomo@circular-chaos.org>
+
+	* gst/audioconvert/gstaudioconvert.c:
+	(gst_audio_convert_fixate_channels):
+	Correctly set the default channel positions when converting to 8
+	channels.
+
 2008-05-19  Tim-Philipp Müller  <tim.muller at collabora co uk>
 
 	* configure.ac:
diff --git a/gst/audioconvert/gstaudioconvert.c b/gst/audioconvert/gstaudioconvert.c
index 8a663769dd..82f03dcaac 100644
--- a/gst/audioconvert/gstaudioconvert.c
+++ b/gst/audioconvert/gstaudioconvert.c
@@ -914,7 +914,7 @@ gst_audio_convert_fixate_channels (GstBaseTransform * base, GstStructure * ins,
    * and try to add/remove channels from the input layout, or pick a default
    * layout based on LFE-presence in input layout, but let's save that for
    * another day) */
-  if (out_chans > 0 && out_chans < G_N_ELEMENTS (default_positions[0])) {
+  if (out_chans > 0 && out_chans <= G_N_ELEMENTS (default_positions[0])) {
     GST_DEBUG_OBJECT (base, "using default channel layout as fallback");
     gst_audio_set_channel_positions (outs, default_positions[out_chans - 1]);
   }