diff --git a/openssl/android-arm64-v8a/PKGBUILD b/openssl/android-arm64-v8a/PKGBUILD
index 665a9618..d5149927 100644
--- a/openssl/android-arm64-v8a/PKGBUILD
+++ b/openssl/android-arm64-v8a/PKGBUILD
@@ -11,7 +11,7 @@ export ANDROID_ARCH=arch-arm64
 _android_arch=arm64-v8a
 _pkgname=openssl
 _ver=1.1.0h
-_pref=/opt/android-$_pkgname/$_android_arch
+_pref=/opt/android-libs/$_android_arch
 
 pkgname=android-$_pkgname-$_android_arch
 # use a pacman compatible version scheme
@@ -44,6 +44,7 @@ build() {
 		-Wl,--no-undefined \
 		no-stdio \
 		no-ui \
+		threads \
 		shared \
 		android
 	
diff --git a/openssl/android-armeabi-v7a/PKGBUILD b/openssl/android-armeabi-v7a/PKGBUILD
index b2acf4d1..bfcc6be5 100644
--- a/openssl/android-armeabi-v7a/PKGBUILD
+++ b/openssl/android-armeabi-v7a/PKGBUILD
@@ -11,7 +11,7 @@ export ANDROID_ARCH=
 _android_arch=armeabi-v7a
 _pkgname=openssl
 _ver=1.1.0h
-_pref=/opt/android-$_pkgname/$_android_arch
+_pref=/opt/android-libs/$_android_arch
 
 pkgname=android-$_pkgname-$_android_arch
 # use a pacman compatible version scheme
@@ -44,6 +44,7 @@ build() {
 		-Wl,--no-undefined \
 		no-stdio \
 		no-ui \
+		threads \
 		shared \
 		android
 	
diff --git a/passwordmanager/android-arm64-v8a/PKGBUILD b/passwordmanager/android-arm64-v8a/PKGBUILD
index cdbedee8..b2eea469 100644
--- a/passwordmanager/android-arm64-v8a/PKGBUILD
+++ b/passwordmanager/android-arm64-v8a/PKGBUILD
@@ -68,9 +68,9 @@ build() {
     -DECM_ADDITIONAL_FIND_ROOT_PATH="$root;$android_ndk_root/platforms/android-$_android_api_level/arch-${_android_arch%-*};$android_ndk_root/sources/cxx-stl/gnu-libstdc++/4.9/libs/$_android_arch" \
     -DQTANDROID_EXPORTED_TARGET=$_pkgname \
     -DANDROID_APK_DIR=android \
-    -DANDROID_EXTRA_LIBS=/opt/android-openssl/arm64-v8a/lib/libcrypto.so;/opt/android-openssl/arm64-v8a/lib/libssl.so;/opt/android-libs/arm64-v8a/lib/libiconv.so;/opt/android-libs/arm64-v8a/lib/libKF5Kirigami2.so
+    -DANDROID_EXTRA_LIBS=/opt/android-libs/arm64-v8a/lib/libcrypto.so;/opt/android-libs/arm64-v8a/lib/libssl.so;/opt/android-libs/arm64-v8a/lib/libiconv.so;/opt/android-libs/arm64-v8a/lib/libKF5Kirigami2.so
 
-    #-DCMAKE_EXE_LINKER_FLAGS="-fPIE;-pie;-Wl,--gc-sections;-Wl,-rpath-link=/opt/android-libs/$_android_arch/lib;/opt/android-qt5/$qt_version/$_android_arch/lib:/opt/android-openssl/$_android_arch/lib" \
+    #-DCMAKE_EXE_LINKER_FLAGS="-fPIE;-pie;-Wl,--gc-sections;-Wl,-rpath-link=/opt/android-libs/$_android_arch/lib;/opt/android-qt5/$qt_version/$_android_arch/lib:/opt/android-libs/$_android_arch/lib" \
 
   make VERBOSE=1
   make DESTDIR="${pkgdir}" create-apk
diff --git a/qt5/android-arm64-v8a/PKGBUILD b/qt5/android-arm64-v8a/PKGBUILD
index e26180b5..28fd09d7 100644
--- a/qt5/android-arm64-v8a/PKGBUILD
+++ b/qt5/android-arm64-v8a/PKGBUILD
@@ -85,7 +85,7 @@ build() {
 
     export ANDROID_NDK_ROOT=/opt/android-ndk
     export ANDROID_SDK_ROOT=/opt/android-sdk
-    export OPENSSL_PREFIX=/opt/android-openssl/${android_arch}
+    export OPENSSL_PREFIX=/opt/android-libs/${android_arch}
 
     if [ -z "${ANDROID_BUILD_TOOLS_REVISION}" ]; then
         export ANDROID_BUILD_TOOLS_REVISION=$(get_last ${ANDROID_SDK_ROOT}/build-tools)