diff --git a/prepare.py b/prepare.py
index a415a4477..0955d431e 100755
--- a/prepare.py
+++ b/prepare.py
@@ -464,7 +464,9 @@ def main(argv=None):
     argparser.add_argument(
         '-L', '--list-cmake-variables', help="(debug) List non-advanced CMake cache variables.", action='store_true', dest='list_cmake_variables')
 
-    args, additional_args = argparser.parse_known_args()
+    args, additional_args2 = argparser.parse_known_args()
+
+    additional_args = []
 
     additional_args += ["-G", args.generator]
 
@@ -509,6 +511,9 @@ def main(argv=None):
         warning("Tunnel enabled, disabling GPL third parties.")
         additional_args += ["-DENABLE_TUNNEL=ON", "-DENABLE_GPL_THIRD_PARTIES=OFF"]
 
+    # User's options are priority upon all automatic options
+    additional_args += additional_args2
+
     if args.list_features:
         list_features(args.debug, additional_args)
         return 0
diff --git a/submodules/belle-sip b/submodules/belle-sip
index 59d40bdb8..bdf7594a8 160000
--- a/submodules/belle-sip
+++ b/submodules/belle-sip
@@ -1 +1 @@
-Subproject commit 59d40bdb82fd7ea89b94e80e563771fbc7d41ada
+Subproject commit bdf7594a81c7c5058b1c4fd1a9cd460bb4666ae7
diff --git a/submodules/cmake-builder b/submodules/cmake-builder
index 96588471a..d490f9a8b 160000
--- a/submodules/cmake-builder
+++ b/submodules/cmake-builder
@@ -1 +1 @@
-Subproject commit 96588471afd37dc0f920e4d9c7c505cb4288d5e4
+Subproject commit d490f9a8b159ee90486c07576425c87af0fb3862
diff --git a/submodules/linphone b/submodules/linphone
index 591a9b88b..f68cf75d7 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit 591a9b88b7df18f4631fa55edf232c1c6dfbdd17
+Subproject commit f68cf75d749df061cb5753c3ee13c7dec3aa9c5f