diff --git a/TutorialHellowWorld/hello-world.xcodeproj/project.pbxproj b/TutorialHellowWorld/hello-world.xcodeproj/project.pbxproj
index 5f5892cf4..015192a68 100755
--- a/TutorialHellowWorld/hello-world.xcodeproj/project.pbxproj
+++ b/TutorialHellowWorld/hello-world.xcodeproj/project.pbxproj
@@ -790,8 +790,8 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 6.0;
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
-					"/Users/gpelloux/code/ios/linphone-iphone/liblinphone-sdk/apple-darwin/lib",
-					"/Users/gpelloux/code/ios/linphone-iphone/liblinphone-sdk/apple-darwin/lib/mediastreamer/plugins",
+					"../../liblinphone-sdk/apple-darwin/lib",
+					"../../liblinphone-sdk/apple-darwin/lib/mediastreamer/plugins",
 				);
 				PRODUCT_NAME = "hello-world";
 				SDKROOT = iphoneos;
@@ -810,8 +810,8 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 6.0;
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
-					"/Users/gpelloux/code/ios/linphone-iphone/liblinphone-sdk/apple-darwin/lib",
-					"/Users/gpelloux/code/ios/linphone-iphone/liblinphone-sdk/apple-darwin/lib/mediastreamer/plugins",
+					"../../liblinphone-sdk/apple-darwin/lib",
+					"../../liblinphone-sdk/apple-darwin/lib/mediastreamer/plugins",
 				);
 				PRODUCT_NAME = "hello-world";
 				SDKROOT = iphoneos;
@@ -833,8 +833,8 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 6.0;
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
-					"/Users/gpelloux/code/ios/linphone-iphone/liblinphone-sdk/apple-darwin/lib",
-					"/Users/gpelloux/code/ios/linphone-iphone/liblinphone-sdk/apple-darwin/lib/mediastreamer/plugins",
+					"../../liblinphone-sdk/apple-darwin/lib",
+					"../../liblinphone-sdk/apple-darwin/lib/mediastreamer/plugins",
 				);
 				PRODUCT_NAME = "hello-world";
 				SDKROOT = iphoneos;
@@ -853,8 +853,8 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 6.0;
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
-					"/Users/gpelloux/code/ios/linphone-iphone/liblinphone-sdk/apple-darwin/lib",
-					"/Users/gpelloux/code/ios/linphone-iphone/liblinphone-sdk/apple-darwin/lib/mediastreamer/plugins",
+					"../../liblinphone-sdk/apple-darwin/lib",
+					"../../liblinphone-sdk/apple-darwin/lib/mediastreamer/plugins",
 				);
 				PRODUCT_NAME = "hello-world";
 				SDKROOT = iphoneos;
@@ -876,7 +876,7 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 6.0;
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
-					"/Users/gpelloux/code/ios/linphone-iphone/liblinphone-sdk/apple-darwin/lib",
+					"../../liblinphone-sdk/apple-darwin/lib",
 				);
 				PRODUCT_NAME = "hello-world";
 				SDKROOT = iphoneos;
@@ -895,7 +895,7 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 6.0;
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
-					"/Users/gpelloux/code/ios/linphone-iphone/liblinphone-sdk/apple-darwin/lib",
+					"../../liblinphone-sdk/apple-darwin/lib",
 				);
 				PRODUCT_NAME = "hello-world";
 				SDKROOT = iphoneos;
@@ -917,7 +917,7 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 6.0;
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
-					"/Users/gpelloux/code/ios/linphone-iphone/liblinphone-sdk/apple-darwin/lib",
+					"../../liblinphone-sdk/apple-darwin/lib",
 				);
 				PRODUCT_NAME = "hello-world";
 				SDKROOT = iphoneos;
@@ -936,7 +936,7 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 6.0;
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
-					"/Users/gpelloux/code/ios/linphone-iphone/liblinphone-sdk/apple-darwin/lib",
+					"../../liblinphone-sdk/apple-darwin/lib",
 				);
 				PRODUCT_NAME = "hello-world";
 				SDKROOT = iphoneos;
diff --git a/prepare.py b/prepare.py
index a9d2431c7..e58d34bd3 100755
--- a/prepare.py
+++ b/prepare.py
@@ -482,7 +482,7 @@ def main(argv=None):
     argparser.add_argument(
         '--enable-non-free-codecs', help="Enable non-free codecs such as OpenH264, MPEG4, etc.. Final application must comply with their respective license (see README.md).", action='store_true')
     argparser.add_argument(
-        '-G' '--generator', help="CMake build system generator (default: Unix Makefiles).", default='Unix Makefiles', choices=['Unix Makefiles', 'Ninja'], dest='generator')
+        '-G' '--generator', help="CMake build system generator (default: Unix Makefiles, use cmake -h to get the complete list).", default='Unix Makefiles', dest='generator')
     argparser.add_argument(
         '-L', '--list-cmake-variables', help="List non-advanced CMake cache variables.", action='store_true', dest='list_cmake_variables')
     argparser.add_argument(
@@ -495,12 +495,6 @@ def main(argv=None):
     args, additional_args = argparser.parse_known_args()
 
     additional_args += ["-G", args.generator]
-    if args.generator == 'Ninja':
-        if not check_is_installed("ninja", "it"):
-            return 1
-        generator = 'ninja -C'
-    else:
-        generator = '$(MAKE) -C'
 
     if check_tools() != 0:
         return 1
@@ -578,7 +572,18 @@ def main(argv=None):
             os.remove('Makefile')
     elif selected_platforms:
         install_git_hook()
-        generate_makefile(selected_platforms, generator)
+
+        # only generated makefile if we are using Ninja or Makefile
+        if args.generator == 'Ninja':
+            if not check_is_installed("ninja", "it"):
+                return 1
+            generate_makefile(selected_platforms, 'ninja -C')
+        elif args.generator == "Unix Makefiles":
+            generate_makefile(selected_platforms, '$(MAKE) -C')
+        elif args.generator == "Xcode":
+            print("You can now open Xcode project with: open WORK/cmake/Project.xcodeproj")
+        else:
+            print("Not generating meta-makefile for generator {}.".format(args.generator))
 
     return 0
 
diff --git a/submodules/belle-sip b/submodules/belle-sip
index 9bf1eecf1..12d21dbb2 160000
--- a/submodules/belle-sip
+++ b/submodules/belle-sip
@@ -1 +1 @@
-Subproject commit 9bf1eecf12bb8a0884025d35de9b50b0875b9ecc
+Subproject commit 12d21dbb2ac58dff25b0ca1c66654234b526a429
diff --git a/submodules/linphone b/submodules/linphone
index f582965b1..fcc39924f 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit f582965b14e8b777db47d52634ba518ec33cae23
+Subproject commit fcc39924ffa45037f83b2217a2f84ddabe962b30