diff --git a/jni/Android.mk b/jni/Android.mk
index 820a5c80b..e2e5e21dd 100755
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -16,7 +16,9 @@ include $(root-dir)/submodules/externals/build/exosip/Android.mk
 
 include $(root-dir)/submodules/externals/build/osip/Android.mk
 
+ifeq ($(WITH_OPENSSL), 1)
 include $(root-dir)/submodules/externals/openssl/Android.mk
+endif
 
 include $(root-dir)/submodules/linphone/oRTP/build/android/Android.mk
 
diff --git a/jni/Application.mk b/jni/Application.mk
index d08417909..726898391 100644
--- a/jni/Application.mk
+++ b/jni/Application.mk
@@ -1,8 +1,13 @@
 APP_PROJECT_PATH := $(call my-dir)/../
-APP_MODULES      :=libspeex libgsm libortp libosip2 libeXosip2 libmediastreamer2  liblinphone libcrypto
+APP_MODULES      :=libspeex libgsm libortp libosip2 libeXosip2 libmediastreamer2  liblinphone
 APP_STL := stlport_static
 
 
+ifeq ($(WITH_OPENSSL),1)
+APP_MODULES += libcrypto libssl
+endif
+
+
 ifeq ($(RING),yes)
 APP_MODULES      += libring
 endif
diff --git a/submodules/externals/openssl b/submodules/externals/openssl
index bbb2e706f..9d2527cee 160000
--- a/submodules/externals/openssl
+++ b/submodules/externals/openssl
@@ -1 +1 @@
-Subproject commit bbb2e706f6d9aeb29f7119ca3edd87e9a578222a
+Subproject commit 9d2527ceee764ce86793861998439712a37ec71b