diff --git a/.gitmodules b/.gitmodules
index 7d451967e..410b8988d 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -89,3 +89,9 @@
 [submodule "submodules/bcunit"]
 	path = submodules/bcunit
 	url = git://git.linphone.org/bcunit.git
+[submodule "submodules/belle-msrp"]
+	path = submodules/belle-msrp
+	url = git://git.linphone.org/belle-msrp.git
+[submodule "submodules/externals/libjpeg-turbo"]
+	path = submodules/externals/libjpeg-turbo
+	url = git://git.linphone.org/libjpeg-turbo.git
diff --git a/prepare.py b/prepare.py
index c6d4e0551..f3caf337d 100755
--- a/prepare.py
+++ b/prepare.py
@@ -132,7 +132,6 @@ class DesktopPreparator(prepare.Preparator):
             self.additional_args += ["-DENABLE_MPEG4=YES"]
             self.additional_args += ["-DENABLE_OPENH264=YES"]
             self.additional_args += ["-DENABLE_VPX=YES"]
-            self.additional_args += ["-DENABLE_X264=NO"]
 
     def check_environment(self):
         ret = prepare.Preparator.check_environment(self)
diff --git a/submodules/bctoolbox b/submodules/bctoolbox
index d0c166650..7254fe94e 160000
--- a/submodules/bctoolbox
+++ b/submodules/bctoolbox
@@ -1 +1 @@
-Subproject commit d0c166650a4a39aaae1d5bc17b5ae64639982930
+Subproject commit 7254fe94e7155f0164fca177f8bf54ab82b76e84
diff --git a/submodules/belcard b/submodules/belcard
index eaeab2d66..f5a8603f8 160000
--- a/submodules/belcard
+++ b/submodules/belcard
@@ -1 +1 @@
-Subproject commit eaeab2d665423e1fdbf2f59c2ae8da6c3c89c8fa
+Subproject commit f5a8603f8e379486d3a4bfa4d74861b0a2d880dd
diff --git a/submodules/belle-msrp b/submodules/belle-msrp
new file mode 160000
index 000000000..7a62a5a2b
--- /dev/null
+++ b/submodules/belle-msrp
@@ -0,0 +1 @@
+Subproject commit 7a62a5a2ba79544984df772573744bafa7c8d6e7
diff --git a/submodules/belle-sip b/submodules/belle-sip
index ac49ba799..b8bc7f2a5 160000
--- a/submodules/belle-sip
+++ b/submodules/belle-sip
@@ -1 +1 @@
-Subproject commit ac49ba799fd9231f1cd7014fe9c061107a832534
+Subproject commit b8bc7f2a5a899e8acfa59c7b49ebabcbab7d0efd
diff --git a/submodules/cmake-builder b/submodules/cmake-builder
index a0680560f..c767e7c43 160000
--- a/submodules/cmake-builder
+++ b/submodules/cmake-builder
@@ -1 +1 @@
-Subproject commit a0680560f471c2c1dd488f271a501e7e1617ec89
+Subproject commit c767e7c434f8ab21bae86de1e828b3ed492af138
diff --git a/submodules/externals/libjpeg-turbo b/submodules/externals/libjpeg-turbo
new file mode 160000
index 000000000..0e99446a2
--- /dev/null
+++ b/submodules/externals/libjpeg-turbo
@@ -0,0 +1 @@
+Subproject commit 0e99446a237bef6704d45f74d504ae8aafa45f9a
diff --git a/submodules/linphone b/submodules/linphone
index 6c4053d10..09627fe95 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit 6c4053d101a99ac574346ca7c5e35e2491d727dd
+Subproject commit 09627fe9562b9e0420e7d27e06bb4619d3ad7f4e