diff --git a/Classes/Utils/NinePatch/NinePatch.xcodeproj/project.pbxproj b/Classes/Utils/NinePatch/NinePatch.xcodeproj/project.pbxproj
index 6f7e5eca3..b0d12a599 100755
--- a/Classes/Utils/NinePatch/NinePatch.xcodeproj/project.pbxproj
+++ b/Classes/Utils/NinePatch/NinePatch.xcodeproj/project.pbxproj
@@ -278,7 +278,6 @@
 				GCC_THUMB_SUPPORT = NO;
 				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				IPHONEOS_DEPLOYMENT_TARGET = 5.1.1;
-				ONLY_ACTIVE_ARCH = NO;
 				PRODUCT_NAME = NinePatch;
 				SKIP_INSTALL = YES;
 				TARGETED_DEVICE_FAMILY = "1,2";
diff --git a/Classes/Utils/XMLRPC/XMLRPC.xcodeproj/project.pbxproj b/Classes/Utils/XMLRPC/XMLRPC.xcodeproj/project.pbxproj
index 30f032b2f..c4e28e185 100755
--- a/Classes/Utils/XMLRPC/XMLRPC.xcodeproj/project.pbxproj
+++ b/Classes/Utils/XMLRPC/XMLRPC.xcodeproj/project.pbxproj
@@ -422,7 +422,6 @@
 				GCC_THUMB_SUPPORT = NO;
 				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				IPHONEOS_DEPLOYMENT_TARGET = 5.1.1;
-				ONLY_ACTIVE_ARCH = NO;
 				PRODUCT_NAME = XMLRPC;
 				PUBLIC_HEADERS_FOLDER_PATH = /headers/;
 				SKIP_INSTALL = YES;
diff --git a/linphone.xcodeproj/project.pbxproj b/linphone.xcodeproj/project.pbxproj
index 8bc0f9ab7..2b74afced 100755
--- a/linphone.xcodeproj/project.pbxproj
+++ b/linphone.xcodeproj/project.pbxproj
@@ -4540,6 +4540,7 @@
 					"$(PROJECT_DIR)/liblinphone-sdk/apple-darwin/lib",
 				);
 				LINK_WITH_STANDARD_LIBRARIES = YES;
+				ONLY_ACTIVE_ARCH = YES;
 				ORDER_FILE = "";
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_NAME = linphone;
@@ -4623,6 +4624,7 @@
 					"$(PROJECT_DIR)/liblinphone-sdk/apple-darwin/lib",
 				);
 				LINK_WITH_STANDARD_LIBRARIES = YES;
+				ONLY_ACTIVE_ARCH = YES;
 				ORDER_FILE = "";
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_NAME = linphone;
@@ -4705,6 +4707,7 @@
 					"$(PROJECT_DIR)/liblinphone-sdk/apple-darwin/lib",
 				);
 				LINK_WITH_STANDARD_LIBRARIES = YES;
+				ONLY_ACTIVE_ARCH = YES;
 				ORDER_FILE = "";
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_NAME = linphone;
@@ -4788,6 +4791,7 @@
 					"$(PROJECT_DIR)/liblinphone-sdk/apple-darwin/lib",
 				);
 				LINK_WITH_STANDARD_LIBRARIES = YES;
+				ONLY_ACTIVE_ARCH = YES;
 				ORDER_FILE = "";
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_NAME = linphone;
@@ -4829,7 +4833,7 @@
 				SDKROOT = iphoneos;
 				STANDARD_C_PLUS_PLUS_LIBRARY_TYPE = dynamic;
 				TARGETED_DEVICE_FAMILY = "1,2";
-				VALID_ARCHS = armv7;
+				VALID_ARCHS = "arm64 armv7";
 			};
 			name = Debug;
 		};
@@ -5282,6 +5286,7 @@
 				INFOPLIST_FILE = KifTests/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				MTL_ENABLE_DEBUG_INFO = YES;
+				ONLY_ACTIVE_ARCH = YES;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-framework",
diff --git a/submodules/build/builder-iphone-os.mk b/submodules/build/builder-iphone-os.mk
index 2e08d5c38..54458280d 100644
--- a/submodules/build/builder-iphone-os.mk
+++ b/submodules/build/builder-iphone-os.mk
@@ -20,7 +20,7 @@
 #
 ############################################################################
 
-host?=armv7-apple-darwin
+host?=armv7-apple-darwin.ios
 enable_i386?=no
 config_site:=iphone-config.site
 library_mode:= --disable-shared --enable-static
@@ -222,15 +222,15 @@ include builders.d/*.mk
 ####################################################################
 
 multi-arch:
-	arm_archives=`find $(prefix) -name *.a` ;\
+	@arm_archives=`find $(prefix) -name *.a` ;\
 	mkdir -p $(prefix)/../apple-darwin; \
 	cp -rf $(prefix)/include  $(prefix)/../apple-darwin/. ; \
 	cp -rf $(prefix)/share  $(prefix)/../apple-darwin/. ; \
 	for archive in $$arm_archives ; do \
 		i386_path=`echo $$archive | sed -e "s/armv7/i386/"` ;\
 		arm64_path=`echo $$archive | sed -e "s/armv7/aarch64/"` ;\
-		x64_path=`echo $$archive | sed -e "s/armv7/x86_64/" | sed -e "s/darwin/darwin.ios/"` ;\
-		destpath=`echo $$archive | sed -e "s/-debug//" | sed -e "s/armv7-//"` ;\
+		x64_path=`echo $$archive | sed -e "s/armv7/x86_64/"` ;\
+		destpath=`echo $$archive | sed -e "s/-debug//" | sed -e "s/armv7-//" | sed -e "s/.ios//"` ;\
 		all_paths=`echo $$archive $$arm64_path`; \
 		all_archs="armv7,aarch64"; \
 		mkdir -p `dirname $$destpath` ; \
diff --git a/submodules/linphone b/submodules/linphone
index 811fabffb..cc2b63af4 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit 811fabffbb5652675a17c19893174092f9efa33f
+Subproject commit cc2b63af4e6af03c5dcc755070f3344fde3016d4