diff --git a/docs/user-guide.rst b/docs/user-guide.rst
index 7e50dc18817b9f17968ecb065ca2ce7245283d3c..c7f7ef86d4e5b7d1993869396a454b7a6a9de26e 100644
--- a/docs/user-guide.rst
+++ b/docs/user-guide.rst
@@ -1074,7 +1074,7 @@ images with support for these features:
    is important to use a version that is compatible with TF-A and fixes any
    known security vulnerabilities. See `mbed TLS Security Center`_ for more
    information. The latest version of TF-A is tested with tag
-   ``mbedtls-2.6.0``.
+   ``mbedtls-2.10.0``.
 
    The ``drivers/auth/mbedtls/mbedtls_*.mk`` files contain the list of mbed TLS
    source files the modules depend upon.
diff --git a/drivers/auth/mbedtls/mbedtls_common.mk b/drivers/auth/mbedtls/mbedtls_common.mk
index 8c4123dbb7a5f00cb0a40a4ddc2f7936ab282e76..a5d19e6a9677f5d59e39c8c8a7120b4ecf087d64 100644
--- a/drivers/auth/mbedtls/mbedtls_common.mk
+++ b/drivers/auth/mbedtls/mbedtls_common.mk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2015, ARM Limited and Contributors. All rights reserved.
+# Copyright (c) 2015-2018, ARM Limited and Contributors. All rights reserved.
 #
 # SPDX-License-Identifier: BSD-3-Clause
 #
@@ -27,6 +27,8 @@ MBEDTLS_COMMON_SOURCES	:=	drivers/auth/mbedtls/mbedtls_common.c	\
 				memory_buffer_alloc.c			\
 				oid.c 					\
 				platform.c 				\
+				platform_util.c				\
+				rsa_internal.c				\
 				)
 
 endif