diff --git a/.gitmodules b/.gitmodules
index 48ff89080..b91741bf7 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -21,7 +21,7 @@
 [submodule "project/jni/application/xserver/xserver"]
 	path = project/jni/application/xserver/xserver
 	url = https://github.com/pelya/xserver.git
-	branch = xsdl2
+	branch = xsdl-1.20
 	update = merge
 [submodule "android-shmem"]
 	path = project/jni/shmem
@@ -41,6 +41,7 @@
 [submodule "project/jni/application/openttd/src"]
 	path = project/jni/application/openttd/src
 	url = https://github.com/pelya/openttd-android.git
+	branch = 1.9
 [submodule "project/jni/application/uae4all2"]
 	path = project/jni/application/uae4all2
 	url = https://github.com/lubomyr/uae4all2.git
@@ -56,6 +57,7 @@
 [submodule "project/jni/application/xserver/pulseaudio"]
 	path = project/jni/application/xserver/pulseaudio
 	url = https://github.com/pelya/pulseaudio-android.git
+	branch = master
 [submodule "project/jni/application/supertux/supertux"]
 	path = project/jni/application/supertux/supertux
 	url = https://github.com/pelya/supertux.git
diff --git a/project/jni/boost/src b/project/jni/boost/src
index aed656a97..dfd133fe6 160000
--- a/project/jni/boost/src
+++ b/project/jni/boost/src
@@ -1 +1 @@
-Subproject commit aed656a97fb3af7322fd2c3da5995a2d09d87d4b
+Subproject commit dfd133fe68e07c0e1d56195a1df18b6766014fe0