diff --git a/prepare.py b/prepare.py
index baa1907c1..db08c89a1 100755
--- a/prepare.py
+++ b/prepare.py
@@ -148,6 +148,8 @@ def main(argv = None):
 		if args.clean:
 			target.clean()
 		else:
+			if args.debug:
+				additional_args += ["-DENABLE_DEBUG_LOGS=YES"]
 			retcode = prepare.run(target, args.debug, False, args.list_cmake_variables, args.force, additional_args)
 			if retcode != 0:
 				return retcode
diff --git a/submodules/cmake-builder b/submodules/cmake-builder
index 1dccafa85..3104be280 160000
--- a/submodules/cmake-builder
+++ b/submodules/cmake-builder
@@ -1 +1 @@
-Subproject commit 1dccafa8521b8b97a63e61dd6ac64d43671c9f8d
+Subproject commit 3104be28033b1bf7981e7725aa020ac073379ff2
diff --git a/submodules/linphone b/submodules/linphone
index 0bf665e86..a4666bd1d 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit 0bf665e86c128c6bcec2f769ad82bd5644704d5d
+Subproject commit a4666bd1dcf36ef25232cfa34bed3bd104808e6c