diff --git a/.gitmodules b/.gitmodules
index b06a1905..0f90d51c 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,3 +4,7 @@
 [submodule "nymea-remoteproxy"]
 	path = nymea-remoteproxy
 	url = https://github.com/guh/nymea-remoteproxy.git
+[submodule "android_openssl"]
+	path = android_openssl
+	url = https://github.com/KDAB/android_openssl.git
+	branch = 1.0.x
diff --git a/android_openssl b/android_openssl
new file mode 160000
index 00000000..edc0a6fb
--- /dev/null
+++ b/android_openssl
@@ -0,0 +1 @@
+Subproject commit edc0a6fb19821d59f13087cf38c9a56932798b57
diff --git a/nymea-app/nymea-app.pro b/nymea-app/nymea-app.pro
index a1becb89..20817a78 100644
--- a/nymea-app/nymea-app.pro
+++ b/nymea-app/nymea-app.pro
@@ -54,6 +54,8 @@ android {
         FIREBASE_STL_VARIANT = gnustl
     }
 
+    include(../android_openssl/openssl.pri)
+
     INCLUDEPATH += /opt/firebase_cpp_sdk/include
     LIBS += -L/opt/firebase_cpp_sdk/libs/android/$$ANDROID_TARGET_ARCH/$$FIREBASE_STL_VARIANT/ -lfirebase_messaging -lfirebase_app
 
@@ -74,12 +76,6 @@ android {
         $$ANDROID_PACKAGE_SOURCE_DIR/src/io/guh/nymeaapp/NymeaAppNotificationService.java \
         $$ANDROID_PACKAGE_SOURCE_DIR/LICENSE
 
-
-    # Build this in /opt/ to build android SSL libs (known to work with android-ndk-r18b)
-    # https://github.com/akontsevich/openssl-android-build
-    ANDROID_EXTRA_LIBS = \
-        /opt/openssl-android-build/libs/android/$$ANDROID_TARGET_ARCH/libcrypto.so \
-        /opt/openssl-android-build/libs/android/$$ANDROID_TARGET_ARCH/libssl.so \
 }
 
 macx: {