diff --git a/client/3rd/OpenSSL/lib/android/arm/libcrypto.a b/client/3rd/OpenSSL/lib/android/arm/libcrypto.a
new file mode 100644
index 000000000..60fca0657
Binary files /dev/null and b/client/3rd/OpenSSL/lib/android/arm/libcrypto.a differ
diff --git a/client/3rd/OpenSSL/lib/android/arm/libssl.a b/client/3rd/OpenSSL/lib/android/arm/libssl.a
new file mode 100644
index 000000000..0698640e1
Binary files /dev/null and b/client/3rd/OpenSSL/lib/android/arm/libssl.a differ
diff --git a/client/3rd/OpenSSL/lib/android/arm64/libcrypto.a b/client/3rd/OpenSSL/lib/android/arm64/libcrypto.a
new file mode 100644
index 000000000..0b5fb5e8f
Binary files /dev/null and b/client/3rd/OpenSSL/lib/android/arm64/libcrypto.a differ
diff --git a/client/3rd/OpenSSL/lib/android/arm64/libssl.a b/client/3rd/OpenSSL/lib/android/arm64/libssl.a
new file mode 100644
index 000000000..c15c6a0e2
Binary files /dev/null and b/client/3rd/OpenSSL/lib/android/arm64/libssl.a differ
diff --git a/client/3rd/OpenSSL/lib/android/x86/libcrypto.a b/client/3rd/OpenSSL/lib/android/x86/libcrypto.a
new file mode 100644
index 000000000..a620ec894
Binary files /dev/null and b/client/3rd/OpenSSL/lib/android/x86/libcrypto.a differ
diff --git a/client/3rd/OpenSSL/lib/android/x86/libssl.a b/client/3rd/OpenSSL/lib/android/x86/libssl.a
new file mode 100644
index 000000000..6508ace56
Binary files /dev/null and b/client/3rd/OpenSSL/lib/android/x86/libssl.a differ
diff --git a/client/3rd/OpenSSL/lib/android/x86_64/libcrypto.a b/client/3rd/OpenSSL/lib/android/x86_64/libcrypto.a
new file mode 100644
index 000000000..21fac25f0
Binary files /dev/null and b/client/3rd/OpenSSL/lib/android/x86_64/libcrypto.a differ
diff --git a/client/3rd/OpenSSL/lib/android/x86_64/libssl.a b/client/3rd/OpenSSL/lib/android/x86_64/libssl.a
new file mode 100644
index 000000000..2c371f4f2
Binary files /dev/null and b/client/3rd/OpenSSL/lib/android/x86_64/libssl.a differ
diff --git a/client/3rd/OpenSSL/lib/windows/x86/openssl.lib b/client/3rd/OpenSSL/lib/windows/x86/openssl.lib
deleted file mode 100644
index 38eaf7035..000000000
Binary files a/client/3rd/OpenSSL/lib/windows/x86/openssl.lib and /dev/null differ
diff --git a/client/3rd/OpenSSL/lib/windows/x86_64/openssl.lib b/client/3rd/OpenSSL/lib/windows/x86_64/openssl.lib
deleted file mode 100644
index 43e459e9a..000000000
Binary files a/client/3rd/OpenSSL/lib/windows/x86_64/openssl.lib and /dev/null differ
diff --git a/client/client.pro b/client/client.pro
index 82234761a..ab85b3062 100644
--- a/client/client.pro
+++ b/client/client.pro
@@ -133,13 +133,6 @@ RESOURCES += \
 TRANSLATIONS = \
     translations/amneziavpn_ru.ts
 
-#CONFIG(release, debug|release) {
-#    DESTDIR = $$PWD/../../AmneziaVPN-build/client/release
-#    MOC_DIR = $$DESTDIR
-#    OBJECTS_DIR = $$DESTDIR
-#    RCC_DIR = $$DESTDIR
-#}
-
 win32 {
     OTHER_FILES += platform_win/vpnclient.rc
     RC_FILE = platform_win/vpnclient.rc
@@ -167,11 +160,11 @@ win32 {
 
    !contains(QMAKE_TARGET.arch, x86_64) {
       message("Windows x86 build")
-      LIBS += -L$$PWD/3rd/OpenSSL/lib/windows/x86/ -llibssl -llibcrypto -lopenssl
+      LIBS += -L$$PWD/3rd/OpenSSL/lib/windows/x86/ -llibssl -llibcrypto
    }
    else {
       message("Windows x86_64 build")
-      LIBS += -L$$PWD/3rd/OpenSSL/lib/windows/x86_64/ -llibssl -llibcrypto -lopenssl
+      LIBS += -L$$PWD/3rd/OpenSSL/lib/windows/x86_64/ -llibssl -llibcrypto
    }
 }
 
@@ -199,10 +192,8 @@ android {
 
    HEADERS +=    protocols/android_vpnprotocol.h \
 
-
    SOURCES +=    protocols/android_vpnprotocol.cpp \
 
-
    DISTFILES += \
        android/AndroidManifest.xml \
        android/build.gradle \
@@ -218,17 +209,22 @@ android {
 
        ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android
 
-        for (abi, ANDROID_ABIS): {
-           ANDROID_EXTRA_LIBS += $$PWD/android/lib/wireguard/$${abi}/libwg.so
-           ANDROID_EXTRA_LIBS += $$PWD/android/lib/wireguard/$${abi}/libwg-go.so
-           ANDROID_EXTRA_LIBS += $$PWD/android/lib/wireguard/$${abi}/libwg-quick.so
+   for (abi, ANDROID_ABIS): {
+      equals(ANDROID_TARGET_ARCH,$$abi) {
+         LIBS += $$PWD/3rd/OpenSSL/lib/android/$${abi}/libcrypto.a
+         LIBS += $$PWD/3rd/OpenSSL/lib/android/$${abi}/libssl.a
+      }
 
-           ANDROID_EXTRA_LIBS += $$PWD/android/lib/openvpn/$${abi}/libjbcrypto.so
-           ANDROID_EXTRA_LIBS += $$PWD/android/lib/openvpn/$${abi}/libopenvpn.so
-           ANDROID_EXTRA_LIBS += $$PWD/android/lib/openvpn/$${abi}/libopvpnutil.so
-           ANDROID_EXTRA_LIBS += $$PWD/android/lib/openvpn/$${abi}/libovpn3.so
-           ANDROID_EXTRA_LIBS += $$PWD/android/lib/openvpn/$${abi}/libovpnexec.so
-        }
+      ANDROID_EXTRA_LIBS += $$PWD/android/lib/wireguard/$${abi}/libwg.so
+      ANDROID_EXTRA_LIBS += $$PWD/android/lib/wireguard/$${abi}/libwg-go.so
+      ANDROID_EXTRA_LIBS += $$PWD/android/lib/wireguard/$${abi}/libwg-quick.so
+
+      ANDROID_EXTRA_LIBS += $$PWD/android/lib/openvpn/$${abi}/libjbcrypto.so
+      ANDROID_EXTRA_LIBS += $$PWD/android/lib/openvpn/$${abi}/libopenvpn.so
+      ANDROID_EXTRA_LIBS += $$PWD/android/lib/openvpn/$${abi}/libopvpnutil.so
+      ANDROID_EXTRA_LIBS += $$PWD/android/lib/openvpn/$${abi}/libovpn3.so
+      ANDROID_EXTRA_LIBS += $$PWD/android/lib/openvpn/$${abi}/libovpnexec.so
+   }
 }
 
 ios {