diff --git a/prepare.py b/prepare.py
index ff7c473bf..9a468ebf0 100755
--- a/prepare.py
+++ b/prepare.py
@@ -205,8 +205,7 @@ def main(argv=None):
                            "-DENABLE_SRTP=NO",
                            "-DENABLE_VPX=NO",
                            "-DENABLE_WASAPI=NO",
-                           "-DENABLE_ZRTP=NO",
-                           "-DCMAKE_OSX_DEPLOYMENT_TARGET=10.10"] + additional_args
+                           "-DENABLE_ZRTP=NO"] + additional_args
 
     if check_tools() != 0:
         return 1
@@ -219,8 +218,8 @@ def main(argv=None):
             if p.retcode != 0:
                 print("Could not clone tunnel. Please see http://www.belledonne-communications.com/voiptunnel.html")
                 return 1
-        print("Tunnel enabled, disabling GPL third parties.")
-        additional_args += ["-DENABLE_TUNNEL=ON", "-DENABLE_GPL_THIRD_PARTIES=OFF"]
+        print("Tunnel enabled.")
+        additional_args += ["-DENABLE_TUNNEL=ON"]
 
     # install_git_hook()
 
diff --git a/submodules/belle-sip b/submodules/belle-sip
index c93a01615..df8d4f2e2 160000
--- a/submodules/belle-sip
+++ b/submodules/belle-sip
@@ -1 +1 @@
-Subproject commit c93a01615811bccdcfbc65aad7247babd1356d72
+Subproject commit df8d4f2e29d1ecccae2cbc35954cc4d1a7715c8b
diff --git a/submodules/cmake-builder b/submodules/cmake-builder
index a412dc2e7..ebb7eb472 160000
--- a/submodules/cmake-builder
+++ b/submodules/cmake-builder
@@ -1 +1 @@
-Subproject commit a412dc2e7d4b0267dce577efb7e8f5e3048d111e
+Subproject commit ebb7eb472c94afc49759ffb7eb87914032086226
diff --git a/submodules/linphone b/submodules/linphone
index ce3064499..aadad2dde 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit ce30644995afb1998eaa9e4dcc6f6b747292d25b
+Subproject commit aadad2dde368c7b2e7b8ee7c6ee7ed6403c11567