diff --git a/ChangeLog b/ChangeLog
index e809b6e749..f7898530fd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-08-10  Tim-Philipp Müller  <tim at centricular dot net>
+
+	Patch by: Michal Benes  <michal.benes at itonis tv>
+
+	* ext/faac/gstfaac.c: (gst_faac_configure_source_pad):
+	  Bitrate in the faac structure is per output channel,
+	  not total bitrate (#350741).
+
 2006-08-09  Tim-Philipp Müller  <tim at centricular dot net>
 
 	* ext/xvid/gstxvidenc.c: (gst_xvidenc_chain):
diff --git a/ext/faac/gstfaac.c b/ext/faac/gstfaac.c
index 60bf67b3f5..e02986ea52 100644
--- a/ext/faac/gstfaac.c
+++ b/ext/faac/gstfaac.c
@@ -30,7 +30,7 @@
     "width = (int) 16, "               \
     "depth = (int) 16, "               \
     "rate = (int) [ 8000, 96000 ], "   \
-    "channels = (int) [ 1, 6] "
+    "channels = (int) [ 1, 6 ] "
 
 /* these don't seem to work? */
 #if 0
@@ -401,7 +401,7 @@ gst_faac_configure_source_pad (GstFaac * faac)
     conf->allowMidside = faac->midside;
     conf->useLfe = 0;
     conf->useTns = faac->tns;
-    conf->bitRate = faac->bitrate;
+    conf->bitRate = faac->bitrate / faac->channels;
     conf->inputFormat = faac->format;
     conf->outputFormat = faac->outputformat;
     conf->shortctl = faac->shortctl;