diff --git a/README.md b/README.md
index 66c708928..38c24dad5 100644
--- a/README.md
+++ b/README.md
@@ -40,14 +40,13 @@ This SDK can be generated in 2 flavors:
 
 ## Customizing features
 
-You can enable all non-free codecs using `--enable-non-free-codecs`.
-You can also choose to enable/disable features one by one (custom audio/video codecs, media encryption, etc.). To get a list of all features, the simplest way is to invoke `prepare.py` with `--list-features`:
+You can enable non-free codecs by using `--enable-non-free-codecs` and `-DENABLE_<codec>=ON`. To get a list of all features, the simplest way is to invoke `prepare.py` with `--list-features`:
 
         ./prepare.py --list-features
 
 You can for instance enable X264 by using:
 
-        ./prepare.py -DENABLE_X264=ON [other options]
+        ./prepare.py --enable-non-free-codecs -DENABLE_X264=ON [other options]
 
 ## Built architectures
 
diff --git a/linphone.xcodeproj/project.pbxproj b/linphone.xcodeproj/project.pbxproj
index 241bfcbff..814820233 100755
--- a/linphone.xcodeproj/project.pbxproj
+++ b/linphone.xcodeproj/project.pbxproj
@@ -3938,7 +3938,7 @@
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CODE_SIGN_IDENTITY = "iPhone Distribution: jehan monnier";
-				ENABLE_BITCODE = NO;
+				ENABLE_BITCODE = YES;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_THUMB_SUPPORT = NO;
@@ -4023,7 +4023,7 @@
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
-				ENABLE_BITCODE = NO;
+				ENABLE_BITCODE = YES;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_THUMB_SUPPORT = NO;
@@ -4108,7 +4108,7 @@
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CODE_SIGN_IDENTITY = "iPhone Distribution: jehan monnier";
-				ENABLE_BITCODE = NO;
+				ENABLE_BITCODE = YES;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_THUMB_SUPPORT = NO;
@@ -4193,7 +4193,7 @@
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CODE_SIGN_IDENTITY = "iPhone Developer: jehan monnier (E8MYPN2NXL)";
-				ENABLE_BITCODE = NO;
+				ENABLE_BITCODE = YES;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
 				GCC_NO_COMMON_BLOCKS = YES;
diff --git a/submodules/cmake-builder b/submodules/cmake-builder
index 92f86c8a2..9e27991eb 160000
--- a/submodules/cmake-builder
+++ b/submodules/cmake-builder
@@ -1 +1 @@
-Subproject commit 92f86c8a2c7b0adb461e945ca508b8ef5aa5db3c
+Subproject commit 9e27991eb93b7e2b5dfa7d447f42bffab86a4e79
diff --git a/submodules/externals/polarssl b/submodules/externals/polarssl
index 5e723467b..919006f5f 160000
--- a/submodules/externals/polarssl
+++ b/submodules/externals/polarssl
@@ -1 +1 @@
-Subproject commit 5e723467b44d2d2128eba54bbad3e80d8dbdac05
+Subproject commit 919006f5f33febe72205078a125fae811b12a3d6