diff --git a/submodules/externals/build/polarssl/Android.mk b/submodules/externals/build/polarssl/Android.mk
index e3b9ecbf8..7190f0cc7 100644
--- a/submodules/externals/build/polarssl/Android.mk
+++ b/submodules/externals/build/polarssl/Android.mk
@@ -36,7 +36,6 @@ LOCAL_SRC_FILES := \
 	md.c \
 	md_wrap.c \
 	memory_buffer_alloc.c \
-	memory.c \
 	net.c \
 	oid.c \
 	padlock.c \
@@ -69,7 +68,10 @@ LOCAL_SRC_FILES := \
 	x509_csr.c \
 	x509write_crt.c \
 	x509write_csr.c \
-	xtea.c 
+	xtea.c \
+	ccm.c \
+	ssl_cookie.c \
+	hmac_drbg.c
 
 
 
diff --git a/submodules/externals/polarssl b/submodules/externals/polarssl
index e46939b25..ab2f403a3 160000
--- a/submodules/externals/polarssl
+++ b/submodules/externals/polarssl
@@ -1 +1 @@
-Subproject commit e46939b25c990d825d94c2d526c350a1380db67f
+Subproject commit ab2f403a3e0ec91257f0e943129c0eec272f34e8
diff --git a/submodules/linphone b/submodules/linphone
index e2d39cf09..2d30e846d 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit e2d39cf097c2b14f4ee75f4a3df3ce49d1bbf462
+Subproject commit 2d30e846d8c8f09f71794866cd8261b65aa8937c