diff --git a/ChangeLog b/ChangeLog
index b52ffd3ca6..5c8795950c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-08-07  Sebastian Dröge  <sebastian.droege@collabora.co.uk>
+
+	* ext/flac/gstflacdec.c:
+	Add FIXME for 0.11 to simply output everything with width=32 as given
+	by FLAC and let audioconvert handle the conversions instead of doing
+	them in flacdec.
+
 2008-08-07  Jan Schmidt  <Jan.Schmidt@sun.com>
 
 	* sys/v4l2/v4l2src_calls.c: (gst_v4l2src_probe_caps_for_format):
diff --git a/ext/flac/gstflacdec.c b/ext/flac/gstflacdec.c
index 66d6c14ce2..dd730b3d30 100644
--- a/ext/flac/gstflacdec.c
+++ b/ext/flac/gstflacdec.c
@@ -205,6 +205,10 @@ static void gst_flac_dec_error_callback_stream (const FLAC__StreamDecoder *
 #endif
 
 GST_BOILERPLATE (GstFlacDec, gst_flac_dec, GstElement, GST_TYPE_ELEMENT);
+
+/* FIXME 0.11: Use width=32 for all depths and let audioconvert
+ * handle the conversions instead of doing it ourself.
+ */
 #define GST_FLAC_DEC_SRC_CAPS                             \
     "audio/x-raw-int, "                                   \
     "endianness = (int) BYTE_ORDER, "                     \