diff --git a/.gitmodules b/.gitmodules
index fc308b280..e0ba3b881 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -85,3 +85,9 @@
 [submodule "submodules/mscodec2"]
 	path = submodules/mscodec2
 	url = git://git.linphone.org/mscodec2.git
+[submodule "submodules/bctoolbox"]
+	path = submodules/bctoolbox
+	url = git://git.linphone.org/bctoolbox.git
+[submodule "submodules/externals/mbedtls"]
+	path = submodules/externals/mbedtls
+	url = https://github.com/ARMmbed/mbedtls.git
diff --git a/Makefile b/Makefile
index 2b3e0f828..0bad496b7 100644
--- a/Makefile
+++ b/Makefile
@@ -61,6 +61,7 @@ BUILD_RTP_MAP=0
 BUILD_DONT_CHECK_HEADERS_IN_MESSAGE=0
 BUILD_ILBC=1
 BUILD_CODEC2=0
+BUILD_BCTOOLBOX_MBEDTLS=0
 LIBLINPHONE_EXTENDED_SRC_FILES=
 LIBLINPHONE_EXTENDED_C_INCLUDES=
 LIBLINPHONE_EXTENDED_CFLAGS=
diff --git a/jni/Android.mk b/jni/Android.mk
index 1f0fd4400..2ba8b6253 100755
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -57,7 +57,14 @@ ifeq ($(BUILD_MATROSKA), 1)
 include $(linphone-root-dir)/submodules/externals/build/libmatroska-c/Android.mk
 endif
 
+ifeq ($(BUILD_BCTOOLBOX_MBEDTLS),1)
+include $(linphone-root-dir)/submodules/externals/build/mbedtls/Android.mk
+include $(linphone-root-dir)/submodules/bctoolbox/build/android/Android-mbedtls.mk
+else
 include $(linphone-root-dir)/submodules/externals/build/polarssl/Android.mk
+include $(linphone-root-dir)/submodules/bctoolbox/build/android/Android-polarssl.mk
+endif
+
 ifeq ($(BUILD_MEDIASTREAMER2_SDK), 0)
 include $(linphone-root-dir)/submodules/externals/build/antlr3/Android.mk
 include $(linphone-root-dir)/submodules/belle-sip/build/android/Android.mk
diff --git a/jni/Application.mk b/jni/Application.mk
index ff48ad149..8650c929e 100644
--- a/jni/Application.mk
+++ b/jni/Application.mk
@@ -55,10 +55,15 @@ ifeq ($(BUILD_UPNP),1)
 APP_MODULES += libupnp
 endif
 
+APP_MODULES +=bctoolbox
 ifeq ($(BUILD_TLS),1)
+ifeq ($(BUILD_BCTOOLBOX_MBEDTLS),1)
+APP_MODULES +=mbedtls
+else
 APP_MODULES +=polarssl
 endif
 endif
+endif
 
 ifeq ($(BUILD_VIDEO),1)
 APP_MODULES += libffmpeg-linphone
diff --git a/submodules/bctoolbox b/submodules/bctoolbox
new file mode 160000
index 000000000..f0080ffcb
--- /dev/null
+++ b/submodules/bctoolbox
@@ -0,0 +1 @@
+Subproject commit f0080ffcb26883b664bc785abff15a6698dee0c3
diff --git a/submodules/externals/mbedtls b/submodules/externals/mbedtls
new file mode 160000
index 000000000..bfafadb45
--- /dev/null
+++ b/submodules/externals/mbedtls
@@ -0,0 +1 @@
+Subproject commit bfafadb45daf8d2114e3109e2f9021fc72ee36bb
diff --git a/submodules/linphone b/submodules/linphone
index 2c929a08c..523cbd2fe 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit 2c929a08c71950a0dab0ab1b97c574d575d3452f
+Subproject commit 523cbd2febdaaa8e6662a5bf1708ab7fba451a70