diff --git a/celt b/celt
index a31a7ea8b109b7365eacddd0ef6f9be046dffcfd..e3d39fec7c44d1841e817d3b1986bfdc4d0863a9 160000
--- a/celt
+++ b/celt
@@ -1 +1 @@
-Subproject commit a31a7ea8b109b7365eacddd0ef6f9be046dffcfd
+Subproject commit e3d39fec7c44d1841e817d3b1986bfdc4d0863a9
diff --git a/configure.ac b/configure.ac
index 32485eca3f4274617a119df26f0e3a5a899672ed..2f7f9a1202971980b1a49818e5d8bccb2aee7bec 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.0)
+AM_INIT_AUTOMAKE(opus,0.9.1)
 
 # Checks for programs.
 AC_PROG_CC
diff --git a/doc/build_draft.sh b/doc/build_draft.sh
index 0508408fffa38cf7afb1665573c924885acc19d3..2e2dfd9960ac591f29ca19d3fe0f72fb384793e5 100755
--- a/doc/build_draft.sh
+++ b/doc/build_draft.sh
@@ -1,19 +1,19 @@
-
+#!/bin/sh
 
 rm -rf opus_source
 cat opus_sources.mk celt_sources.mk silk_sources.mk opus_headers.txt celt_headers.txt silk_headers.txt | sed -e 's/^.*=//' -e 's/\\//' > all_files.txt
-tar czvf tmp_draft.tar.gz `cat all_files.txt`
+tar czf tmp_draft.tar.gz `cat all_files.txt`
 
 mkdir opus_source
 cd opus_source
-tar xzvf ../tmp_draft.tar.gz
+tar xzf ../tmp_draft.tar.gz
 cp ../Makefile.draft Makefile
 cp ../opus_sources.mk .
 cp ../celt_sources.mk .
 cp ../silk_sources.mk .
 
 cd ..
-tar czvf opus_source.tar.gz opus_source
+tar czf opus_source.tar.gz opus_source
 cat opus_source.tar.gz| base64 -w 66 | sed 's/^/###/' > doc/opus_source.base64
 
 cd doc
diff --git a/doc/draft-ietf-codec-opus.xml b/doc/draft-ietf-codec-opus.xml
index 242b0fee5808fdf0e0d816670b11c06f8037030c..b51e5e112e71ec7ec11be24fe4b5c0d4eb732596 100644
--- a/doc/draft-ietf-codec-opus.xml
+++ b/doc/draft-ietf-codec-opus.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE rfc SYSTEM 'rfc2629.dtd'>
 <?rfc toc="yes" symrefs="yes" ?>
 
-<rfc ipr="trust200902" category="std" docName="draft-ietf-codec-opus-02">
+<rfc ipr="trust200902" category="std" docName="draft-ietf-codec-opus-03">
 
 <front>
 <title abbrev="Interactive Audio Codec">Definition of the Opus Audio Codec</title>
@@ -39,7 +39,7 @@
 </author>
 
 
-<date day="4" month="February" year="2011" />
+<date day="15" month="February" year="2011" />
 
 <area>General</area>
 
diff --git a/silk_headers.txt b/silk_headers.txt
index 1157db7999bc937d27a9aba338d3e312babc2343..d7462ae0fc45c653236a5ec23f681f13ba5123a9 100644
--- a/silk_headers.txt
+++ b/silk_headers.txt
@@ -16,7 +16,6 @@ silk/src_FIX/SKP_Silk_structs_FIX.h
 silk/src_FLP/SKP_Silk_assembler_FLP.h
 silk/src_FLP/SKP_Silk_main_FLP.h
 silk/src_FLP/SKP_Silk_structs_FLP.h
-silk/src_SigProc_FIX/SKP_Silk_common_pitch_est_defines.h
 silk/src_SigProc_FIX/SKP_Silk_Inlines.h
 silk/src_SigProc_FIX/SKP_Silk_MacroCount.h
 silk/src_SigProc_FIX/SKP_Silk_MacroDebug.h
diff --git a/silk_sources.mk b/silk_sources.mk
index 7fc3e6e13f234dd37d6a39f5f1f73881bab5b2ac..2c74c73889dc46f66a467370d3a14f8d63223989 100644
--- a/silk_sources.mk
+++ b/silk_sources.mk
@@ -70,6 +70,7 @@ silk/src_SigProc_FIX/SKP_Silk_biquad_alt.c \
 silk/src_SigProc_FIX/SKP_Silk_burg_modified.c \
 silk/src_SigProc_FIX/SKP_Silk_bwexpander_32.c \
 silk/src_SigProc_FIX/SKP_Silk_bwexpander.c \
+silk/src_SigProc_FIX/SKP_Silk_debug.c \
 silk/src_SigProc_FIX/SKP_Silk_decode_pitch.c \
 silk/src_SigProc_FIX/SKP_Silk_inner_prod_aligned.c \
 silk/src_SigProc_FIX/SKP_Silk_k2a.c \
@@ -78,15 +79,16 @@ silk/src_SigProc_FIX/SKP_Silk_lin2log.c \
 silk/src_SigProc_FIX/SKP_Silk_log2lin.c \
 silk/src_SigProc_FIX/SKP_Silk_lowpass_int.c \
 silk/src_SigProc_FIX/SKP_Silk_lowpass_short.c \
+silk/src_SigProc_FIX/SKP_Silk_LPC_analysis_filter.c \
 silk/src_SigProc_FIX/SKP_Silk_LPC_inv_pred_gain.c \
 silk/src_SigProc_FIX/SKP_Silk_LPC_stabilize.c \
 silk/src_SigProc_FIX/SKP_Silk_LPC_synthesis_filter.c \
 silk/src_SigProc_FIX/SKP_Silk_LPC_synthesis_order16.c \
 silk/src_SigProc_FIX/SKP_Silk_LSF_cos_table.c \
-silk/src_SigProc_FIX/SKP_Silk_MA.c \
 silk/src_SigProc_FIX/SKP_Silk_NLSF2A.c \
 silk/src_SigProc_FIX/SKP_Silk_NLSF_stabilize.c \
 silk/src_SigProc_FIX/SKP_Silk_NLSF_VQ_weights_laroia.c \
+silk/src_SigProc_FLP/SKP_Silk_NLSF_VQ_weights_laroia_FLP.c \
 silk/src_SigProc_FIX/SKP_Silk_pitch_analysis_core.c \
 silk/src_SigProc_FIX/SKP_Silk_pitch_est_tables.c \
 silk/src_SigProc_FIX/SKP_Silk_resampler.c \