diff --git a/.gitmodules b/.gitmodules
index 4fbc16494..99c5dff91 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -22,9 +22,6 @@
 [submodule "submodules/mssilk"]
 	path = submodules/mssilk
 	url = git://git.linphone.org/mssilk.git
-[submodule "submodules/mswasapi"]
-	path = submodules/mswasapi
-	url = git://git.linphone.org/mswasapi.git
 [submodule "submodules/msx264"]
 	path = submodules/msx264
 	url = git://git.linphone.org/msx264.git
diff --git a/prepare.py b/prepare.py
index 316ee080b..1c4196f17 100755
--- a/prepare.py
+++ b/prepare.py
@@ -81,6 +81,7 @@ class PythonTarget(prepare.Target):
         self.config_file = 'configs/config-python.cmake'
         self.output = 'OUTPUT/' + self.name
         self.external_source_path = os.path.join(current_path, 'submodules')
+        self.additional_args += ["-DLINPHONE_BUILDER_PYTHON_VERSION={}.{}".format(sys.version_info.major, sys.version_info.minor)]
 
 
 class PythonRaspberryTarget(prepare.Target):
diff --git a/submodules/externals/libjpeg-turbo b/submodules/externals/libjpeg-turbo
index 69ea52a05..9f34b5ead 160000
--- a/submodules/externals/libjpeg-turbo
+++ b/submodules/externals/libjpeg-turbo
@@ -1 +1 @@
-Subproject commit 69ea52a05d75a45d4aa54e0558c64d52bdb39604
+Subproject commit 9f34b5eade75fd8e1548e6c7daf278d6ffb73526
diff --git a/submodules/externals/libmatroska-c b/submodules/externals/libmatroska-c
index 12efd631f..0c7250913 160000
--- a/submodules/externals/libmatroska-c
+++ b/submodules/externals/libmatroska-c
@@ -1 +1 @@
-Subproject commit 12efd631fbeebafdeb7a870ad0c1ed7931a2d95f
+Subproject commit 0c7250913a2f87d4640b64a347918280569f3148
diff --git a/submodules/oRTP b/submodules/oRTP
new file mode 160000
index 000000000..bd792338c
--- /dev/null
+++ b/submodules/oRTP
@@ -0,0 +1 @@
+Subproject commit bd792338c47c3849cce3661d4e693df0177873c0