diff --git a/doc/build_draft.sh b/doc/build_draft.sh
index 2e2dfd9960ac591f29ca19d3fe0f72fb384793e5..6068bd4a7af40afd85bfc650e9be6117b1c07ac6 100755
--- a/doc/build_draft.sh
+++ b/doc/build_draft.sh
@@ -1,5 +1,6 @@
 #!/bin/sh
 
+echo packaging source code
 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 czf tmp_draft.tar.gz `cat all_files.txt`
@@ -14,6 +15,7 @@ cp ../silk_sources.mk .
 
 cd ..
 tar czf opus_source.tar.gz opus_source
+echo building base64 version
 cat opus_source.tar.gz| base64 -w 66 | sed 's/^/###/' > doc/opus_source.base64
 
 cd doc
@@ -24,4 +26,6 @@ cat opus_compare.m >> opus_compare_escaped.m
 echo ']]>' >> opus_compare_escaped.m
 echo '</artwork>' >> opus_compare_escaped.m
 echo '</figure>' >> opus_compare_escaped.m
+
+echo running xml2rfc
 xml2rfc draft-ietf-codec-opus.xml
diff --git a/silk b/silk
index c4d32b16334ebc2ee607fd5564c6f42a6c71989d..8930d2fa66a775040b264d9d2c5950fd403bb267 160000
--- a/silk
+++ b/silk
@@ -1 +1 @@
-Subproject commit c4d32b16334ebc2ee607fd5564c6f42a6c71989d
+Subproject commit 8930d2fa66a775040b264d9d2c5950fd403bb267
diff --git a/silk_sources.mk b/silk_sources.mk
index 2c74c73889dc46f66a467370d3a14f8d63223989..f65fbce7fa5769e068fc0d873cd03185e266874a 100644
--- a/silk_sources.mk
+++ b/silk_sources.mk
@@ -13,8 +13,13 @@ silk/src_common/SKP_Silk_encode_indices.c \
 silk/src_common/SKP_Silk_encode_pulses.c \
 silk/src_common/SKP_Silk_gain_quant.c \
 silk/src_common/SKP_Silk_interpolate.c \
+silk/src_common/SKP_Silk_HP_variable_cutoff.c \
 silk/src_common/SKP_Silk_LBRR_embed.c \
 silk/src_common/SKP_Silk_LP_variable_cutoff.c \
+silk/src_common/SKP_Silk_NLSF_MSVQ_encode.c \
+silk/src_common/SKP_Silk_NLSF_VQ_rate_distortion.c \
+silk/src_common/SKP_Silk_NLSF_VQ_sum_error.c \
+silk/src_common/SKP_Silk_process_NLSFs.c \
 silk/src_common/SKP_Silk_NLSF2A_stable.c \
 silk/src_common/SKP_Silk_NLSF_MSVQ_decode.c \
 silk/src_common/SKP_Silk_NSQ.c \
@@ -42,19 +47,13 @@ silk/src_FLP/SKP_Silk_find_LPC_FLP.c \
 silk/src_FLP/SKP_Silk_find_LTP_FLP.c \
 silk/src_FLP/SKP_Silk_find_pitch_lags_FLP.c \
 silk/src_FLP/SKP_Silk_find_pred_coefs_FLP.c \
-silk/src_FLP/SKP_Silk_HP_variable_cutoff_FLP.c \
 silk/src_FLP/SKP_Silk_init_encoder_FLP.c \
 silk/src_FLP/SKP_Silk_LPC_analysis_filter_FLP.c \
 silk/src_FLP/SKP_Silk_LTP_analysis_filter_FLP.c \
 silk/src_FLP/SKP_Silk_LTP_scale_ctrl_FLP.c \
-silk/src_FLP/SKP_Silk_NLSF_MSVQ_decode_FLP.c \
-silk/src_FLP/SKP_Silk_NLSF_MSVQ_encode_FLP.c \
-silk/src_FLP/SKP_Silk_NLSF_VQ_rate_distortion_FLP.c \
-silk/src_FLP/SKP_Silk_NLSF_VQ_sum_error_FLP.c \
 silk/src_FLP/SKP_Silk_noise_shape_analysis_FLP.c \
 silk/src_FLP/SKP_Silk_prefilter_FLP.c \
 silk/src_FLP/SKP_Silk_process_gains_FLP.c \
-silk/src_FLP/SKP_Silk_process_NLSFs_FLP.c \
 silk/src_FLP/SKP_Silk_regularize_correlations_FLP.c \
 silk/src_FLP/SKP_Silk_residual_energy_FLP.c \
 silk/src_FLP/SKP_Silk_solve_LS_FLP.c \
@@ -88,7 +87,6 @@ silk/src_SigProc_FIX/SKP_Silk_LSF_cos_table.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 \