diff --git a/.gitmodules b/.gitmodules
index bd00d7d20..a7239f992 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -49,7 +49,6 @@
 [submodule "project/jni/application/openttd/src"]
 	path = project/jni/application/openttd/src
 	url = git@github.com:pelya/openttd-android.git
-	branch = master
 [submodule "project/jni/application/xserver-debian/xserver"]
 	path = project/jni/application/xserver-debian/xserver
 	url = git@github.com:pelya/xserver.git
@@ -65,3 +64,7 @@
 [submodule "project/jni/application/vice/vice"]
 	path = project/jni/application/vice/vice
 	url = git@github.com:lubomyr/vice-2.4.git
+[submodule "project/jni/openssl/openssl/jni"]
+	path = project/jni/openssl/openssl/jni
+	url = https://android.googlesource.com/platform/external/openssl
+	branch = lollipop-mr1-dev
diff --git a/project/jni/iconv/src b/project/jni/iconv/src
index a63fa87d2..a6a653107 160000
--- a/project/jni/iconv/src
+++ b/project/jni/iconv/src
@@ -1 +1 @@
-Subproject commit a63fa87d2e1658428d3eace6432e9d6a206ea393
+Subproject commit a6a6531070409723b8b04ce4741a4f97e718dce8
diff --git a/project/jni/openssl/.gitignore b/project/jni/openssl/.gitignore
deleted file mode 100644
index c2c2afc15..000000000
--- a/project/jni/openssl/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-openssl/
diff --git a/project/jni/openssl/compile.sh b/project/jni/openssl/compile.sh
index 7be64a698..43b780d38 100755
--- a/project/jni/openssl/compile.sh
+++ b/project/jni/openssl/compile.sh
@@ -2,13 +2,11 @@
 
 ARCH_LIST="armeabi armeabi-v7a arm64-v8a x86 mips x86_64"
 
-[ -e openssl ] || {
-	mkdir -p openssl
-	git clone --depth=1 -b lollipop-mr1-dev https://android.googlesource.com/platform/external/openssl openssl/jni || exit 1
-} || exit 1
 #sed -i 's/BUILD_HOST_SHARED_LIBRARY/BUILD_SHARED_LIBRARY/g' openssl/jni/*.mk
 #sed -i 's/BUILD_HOST_STATIC_LIBRARY/BUILD_STATIC_LIBRARY/g' openssl/jni/*.mk
-sed -i 's@external/openssl/@jni/@g' openssl/jni/*.mk
+#sed -i 's@external/openssl/@jni/@g' openssl/jni/*.mk
+mkdir -p openssl/external
+ln -s ../jni openssl/external/openssl
 cp -f Apps.mk openssl/jni/Apps.mk
 touch openssl/jni/Empty.mk
 echo APP_MODULES := libcrypto_static_ndk libssl_static_ndk > openssl/jni/Application.mk
diff --git a/project/jni/openssl/openssl/jni b/project/jni/openssl/openssl/jni
new file mode 160000
index 000000000..879558776
--- /dev/null
+++ b/project/jni/openssl/openssl/jni
@@ -0,0 +1 @@
+Subproject commit 87955877681c4c832ee3df0bdba67d3e2e3d49f2