diff --git a/celt b/celt
index a7be4387166462d6dd5ea6184debacb0aca509a0..c5f999097f64eb090e1a353a57f80045ece7330a 160000
--- a/celt
+++ b/celt
@@ -1 +1 @@
-Subproject commit a7be4387166462d6dd5ea6184debacb0aca509a0
+Subproject commit c5f999097f64eb090e1a353a57f80045ece7330a
diff --git a/configure.ac b/configure.ac
index 50df7db9dce0e27b0aaca0078678ad6ea13bf0bc..8305e9fed989475b937177f1041eda57966ad092 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@
 
 AC_PREREQ([2.59])
 AC_INIT(src/opus.h)
-AM_INIT_AUTOMAKE(opus,0.9.3)
+AM_INIT_AUTOMAKE(opus,0.9.4)
 
 # Checks for programs.
 AC_PROG_CC
diff --git a/doc/draft-ietf-codec-opus.xml b/doc/draft-ietf-codec-opus.xml
index 7ad975853f3b497ececf4041070a2780a91ac0da..45f36fd6855258ad53e82e83fa552c089fc8caee 100644
--- a/doc/draft-ietf-codec-opus.xml
+++ b/doc/draft-ietf-codec-opus.xml
@@ -2030,7 +2030,9 @@ This document has no actions for IANA.
 <section anchor="Acknowledgments" title="Acknowledgments">
 <t>
 Thanks to all other developers, including Raymond Chen, Soeren Skak Jensen, Gregory Maxwell, 
-Christopher Montgomery, Karsten Vandborg Soerensen, and Timothy Terriberry.
+Christopher Montgomery, Karsten Vandborg Soerensen, and Timothy Terriberry. We would also
+like to thank Igor Dyakonov, Jan Skoglund and Keith Yan for their help in testing the
+codec.
 </t>
 </section> 
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 1118b9f608844568f6286403c8804d569127b6a5..12b88f679a69bcdb5d041f0eff706eeadf2d2d51 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,5 +1,5 @@
 
-EXTRA_dist = hybrid.vcxproj.filters  hybrid.vcxproj
+EXTRA_DIST = hybrid.vcxproj.filters  hybrid.vcxproj
 
 INCLUDES = -I$(top_srcdir)/celt/libcelt/ -I$(top_srcdir)/silk/interface 
 
diff --git a/src/opus_decoder.c b/src/opus_decoder.c
index 63c2bacbc0951f23778be54b1aedfde8f1215395..b0121ce32623797669431f1867fdbc436690062c 100644
--- a/src/opus_decoder.c
+++ b/src/opus_decoder.c
@@ -135,6 +135,7 @@ static int opus_decode_frame(OpusDecoder *st, const unsigned char *data,
     if (st->stream_channels > st->channels)
         return OPUS_CORRUPTED_DATA;
 
+    /* FIXME: Remove this when we add SILK stereo support */
     if (st->stream_channels == 2 && mode != MODE_CELT_ONLY)
         return OPUS_UNIMPLEMENTED;