diff --git a/.gitmodules b/.gitmodules
index c9e476364..f064d4d5a 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -28,3 +28,6 @@
 [submodule "submodules/externals/zrtpcpp"]
 	path = submodules/externals/zrtpcpp
 	url = git://github.com/wernerd/ZRTPCPP.git
+[submodule "submodules/mssilk"]
+	path = submodules/mssilk
+	url = git://git.linphone.org/mssilk.git
diff --git a/README b/README
index 4c34e693f..585fe2262 100644
--- a/README
+++ b/README
@@ -23,5 +23,11 @@ In case you upgrade your IOS SDK, you may force configure by using make targets
 Libraries are available from liblinphone-sdk/
 
 AMR plugin
-liblinphone-sdk contains Linphone ARM pluging. As AMR may require to pay for patents, it is not enabled unless Linphone for iphone is compiled with gcc flag HAVE_AMR.
+liblinphone-sdk contains Linphone ARM plugin. As AMR may require to pay for patents, it is not enabled unless Linphone for iphone is compiled with gcc flag HAVE_AMR.
+
+SILK plugin
+liblinphone-sdk contains Linphone SILK plugin.
+As Skype requires that you accept its license, the plugin is not compiled and enabled unless:
+- you compile the SDK with enable_silk=yes flag;
+- you compile the UI with HAVE_SILK flag.
 
diff --git a/linphone.xcodeproj/project.pbxproj b/linphone.xcodeproj/project.pbxproj
index fe4a6f189..9779add49 100755
--- a/linphone.xcodeproj/project.pbxproj
+++ b/linphone.xcodeproj/project.pbxproj
@@ -86,7 +86,6 @@
 		288765FD0DF74451002DB57D /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 288765FC0DF74451002DB57D /* CoreGraphics.framework */; };
 		70571E1A13FABCB000CDD3C2 /* rootca.pem in Resources */ = {isa = PBXBuildFile; fileRef = 70571E1913FABCB000CDD3C2 /* rootca.pem */; };
 		F0A486D91404FE53009EC0BE /* libsrtp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F0A486D71404FE53009EC0BE /* libsrtp.a */; };
-		F0DDBA23145AE3F6000ABF7F /* libmssilk.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F0DDBA22145AE3F6000ABF7F /* libmssilk.a */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -407,8 +406,6 @@
 		70571E1913FABCB000CDD3C2 /* rootca.pem */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = rootca.pem; path = Resources/rootca.pem; sourceTree = "<group>"; };
 		8D1107310486CEB800E47090 /* linphone-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "linphone-Info.plist"; plistStructureDefinitionIdentifier = "com.apple.xcode.plist.structure-definition.iphone.info-plist"; sourceTree = "<group>"; };
 		F0A486D71404FE53009EC0BE /* libsrtp.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libsrtp.a; path = "liblinphone-sdk/apple-darwin/lib/libsrtp.a"; sourceTree = "<group>"; };
-		F0DDBA22145AE3F6000ABF7F /* libmssilk.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libmssilk.a; path = "liblinphone-sdk/apple-darwin/lib/mediastreamer/plugins/libmssilk.a"; sourceTree = "<group>"; };
-		F0DDBA24145AE46C000ABF7F /* libmssilk.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libmssilk.a; path = "liblinphone-sdk/apple-darwin/lib/mediastreamer/plugins/libmssilk.a"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -416,7 +413,6 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				F0DDBA23145AE3F6000ABF7F /* libmssilk.a in Frameworks */,
 				22E5B0AF133B5EA20044EA25 /* libssl.a in Frameworks */,
 				22E5B0B0133B5EA20044EA25 /* libcrypto.a in Frameworks */,
 				1D60589F0D05DD5A006BFB54 /* Foundation.framework in Frameworks */,
@@ -799,8 +795,6 @@
 		29B97314FDCFA39411CA2CEA /* CustomTemplate */ = {
 			isa = PBXGroup;
 			children = (
-				F0DDBA24145AE46C000ABF7F /* libmssilk.a */,
-				F0DDBA22145AE3F6000ABF7F /* libmssilk.a */,
 				F0A486D71404FE53009EC0BE /* libsrtp.a */,
 				2214783B1386A2030020F8B8 /* Localizable.strings */,
 				22A10D9E11F88C1F00373793 /* liblinphone.xcodeproj */,
@@ -1058,17 +1052,13 @@
 					armv6,
 					i386,
 				);
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
 				FRAMEWORK_SEARCH_PATHS = "";
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = linphone_Prefix.pch;
-				GCC_PREPROCESSOR_DEFINITIONS = (
-					IN_LINPHONE,
-					HAVE_SILK,
-				);
+				GCC_PREPROCESSOR_DEFINITIONS = IN_LINPHONE;
 				GCC_VERSION = com.apple.compilers.llvmgcc42;
 				HEADER_SEARCH_PATHS = (
 					submodules/linphone/coreapi,
@@ -1097,9 +1087,12 @@
 					mediastreamer,
 					"-l",
 					srtp,
+					"-l",
+					mssilk,
+					"-l",
+					SKP_SILK_SDK,
 				);
 				PRODUCT_NAME = linphone;
-				"PROVISIONING_PROFILE[sdk=iphoneos*]" = "";
 				SDKROOT = iphoneos;
 				STANDARD_C_PLUS_PLUS_LIBRARY_TYPE = dynamic;
 				TARGETED_DEVICE_FAMILY = 1;
@@ -1141,10 +1134,7 @@
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = linphone_Prefix.pch;
-				GCC_PREPROCESSOR_DEFINITIONS = (
-					IN_LINPHONE,
-					HAVE_SILK,
-				);
+				GCC_PREPROCESSOR_DEFINITIONS = IN_LINPHONE;
 				GCC_VERSION = com.apple.compilers.llvmgcc42;
 				HEADER_SEARCH_PATHS = (
 					submodules/linphone/coreapi,
@@ -1173,6 +1163,10 @@
 					mediastreamer,
 					"-l",
 					srtp,
+					"-l",
+					mssilk,
+					"-l",
+					SKP_SILK_SDK,
 				);
 				PRODUCT_NAME = linphone;
 				"PROVISIONING_PROFILE[sdk=iphoneos*]" = "";
@@ -1217,10 +1211,7 @@
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = linphone_Prefix.pch;
-				GCC_PREPROCESSOR_DEFINITIONS = (
-					IN_LINPHONE,
-					HAVE_SILK,
-				);
+				GCC_PREPROCESSOR_DEFINITIONS = IN_LINPHONE;
 				GCC_VERSION = com.apple.compilers.llvmgcc42;
 				HEADER_SEARCH_PATHS = (
 					submodules/linphone/coreapi,
@@ -1249,6 +1240,10 @@
 					mediastreamer,
 					"-l",
 					srtp,
+					"-l",
+					mssilk,
+					"-l",
+					SKP_SILK_SDK,
 				);
 				PRODUCT_NAME = linphone;
 				"PROVISIONING_PROFILE[sdk=iphoneos*]" = "";
diff --git a/submodules/build/builder-iphone-os.mk b/submodules/build/builder-iphone-os.mk
index 9fe55de5b..a20825c06 100644
--- a/submodules/build/builder-iphone-os.mk
+++ b/submodules/build/builder-iphone-os.mk
@@ -21,7 +21,8 @@
 ############################################################################
  
 host?=armv6-apple-darwin
-enable_zrtp=no
+enable_zrtp?=no
+enable_silk?=no
 config_site:=iphone-config.site
 library_mode:= --disable-shared --enable-static
 linphone_configure_controls=  --disable-video \
diff --git a/submodules/build/builders.d/mssilk.mk b/submodules/build/builders.d/mssilk.mk
index ff1616db3..706496c8c 100644
--- a/submodules/build/builders.d/mssilk.mk
+++ b/submodules/build/builders.d/mssilk.mk
@@ -21,33 +21,40 @@
 ############################################################################
 mssilk_dir?=mssilk
 
-ifneq (,$(findstring arm,$(host)))
-	MSSILK_CONFIGURE_OPTION := --with-silk-flavour=ARM
-endif
-
 $(BUILDER_SRC_DIR)/$(mssilk_dir)/configure:
 	echo -e "\033[01;32m Running autogen for mssilk in $(BUILDER_SRC_DIR)/$(mssilk_dir) \033[0m"
 	cd $(BUILDER_SRC_DIR)/$(mssilk_dir) && ./autogen.sh
 
 $(BUILDER_BUILD_DIR)/$(mssilk_dir)/Makefile: $(BUILDER_SRC_DIR)/$(mssilk_dir)/configure
-	echo -e "\033[01;32m Running configure in $(BUILDER_BUILD_DIR)/$(mssilk_dir)  \033[0m"
+	echo -e "\033[01;32m Running configure in $(BUILDER_BUILD_DIR)/$(mssilk_dir) \033[0m"
 	mkdir -p $(BUILDER_BUILD_DIR)/$(mssilk_dir)
 	cd $(BUILDER_BUILD_DIR)/$(mssilk_dir)/ \
-	&& PKG_CONFIG_PATH=$(prefix)/lib/pkgconfig CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) \
-	$(BUILDER_SRC_DIR)/$(mssilk_dir)/configure -prefix=$(prefix) --host=$(host) ${library_mode} \
-	$(MSSILK_CONFIGURE_OPTION) --enable-static
+		&& PKG_CONFIG_PATH=$(prefix)/lib/pkgconfig CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) \
+		$(BUILDER_SRC_DIR)/$(mssilk_dir)/configure -prefix=$(prefix) --host=$(host) ${library_mode} \
+		--enable-static
 
+ifeq ($(enable_silk),yes)
 
 build-mssilk: $(BUILDER_BUILD_DIR)/$(mssilk_dir)/Makefile
 	echo -e "\033[01;32m building silk \033[0m"
-	cd $(BUILDER_BUILD_DIR)/$(mssilk_dir) && PKG_CONFIG_PATH=$(prefix)/lib/pkgconfig CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site)  make -j1 && make install
+	cd $(BUILDER_BUILD_DIR)/$(mssilk_dir) \
+		&& PKG_CONFIG_PATH=$(prefix)/lib/pkgconfig \
+		CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) \
+		make -j1 && make install
+
+
+else
+build-mssilk:
+	echo "SILK is disabled"
+
+endif
 
 clean-mssilk: 
-	cd  $(BUILDER_BUILD_DIR)/$(mssilk_dir) && make clean
+	-cd  $(BUILDER_BUILD_DIR)/$(mssilk_dir) && make clean
 
 veryclean-mssilk: 
 	-cd $(BUILDER_BUILD_DIR)/$(mssilk_dir) && make distclean 
 	rm -f $(BUILDER_SRC_DIR)/$(mssilk_dir)/configure
 
 clean-makefile-mssilk: 
-	cd $(BUILDER_BUILD_DIR)/$(mssilk_dir) && rm -f Makefile
+	-cd $(BUILDER_BUILD_DIR)/$(mssilk_dir) && rm -f Makefile
diff --git a/submodules/linphone b/submodules/linphone
index 9720942c6..81a9a7073 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit 9720942c63319dae94425e4543c4b7d5edb885be
+Subproject commit 81a9a7073b03f7e8db2bfe83545613b9daa09305
diff --git a/submodules/mssilk b/submodules/mssilk
new file mode 160000
index 000000000..a0ad1cca9
--- /dev/null
+++ b/submodules/mssilk
@@ -0,0 +1 @@
+Subproject commit a0ad1cca900afc17204856fd7c2de7e8d511eaad