diff --git a/docs/getting_started/requirements.rst b/docs/getting_started/requirements.rst
index 89bc9f6..1ffdb13 100644
--- a/docs/getting_started/requirements.rst
+++ b/docs/getting_started/requirements.rst
@@ -25,7 +25,7 @@
 ======================== =====================
         Name             Version
 ======================== =====================
-Mbed TLS                 3.6.3
+Mbed TLS                 3.6.4
 ======================== =====================
 
 Toolchain
diff --git a/ext/mbedtls b/ext/mbedtls
index 22098d4..c765c83 160000
--- a/ext/mbedtls
+++ b/ext/mbedtls
@@ -1 +1 @@
-Subproject commit 22098d41c6620ce07cf8a0134d37302355e1e5ef
+Subproject commit c765c831e5c2a0971410692f92f7a81d6ec65ec2
diff --git a/include/configs/tftf_mbedtls_config.h b/include/configs/tftf_mbedtls_config.h
index 9ad0b71..66ec744 100644
--- a/include/configs/tftf_mbedtls_config.h
+++ b/include/configs/tftf_mbedtls_config.h
@@ -21,8 +21,8 @@
 /* For snprintf function declaration */
 #include <stdio.h>
 
-/* This file is compatible with release 3.6.3 */
-#define MBEDTLS_CONFIG_VERSION         0x03060300
+/* This file is compatible with release 3.6.4 */
+#define MBEDTLS_CONFIG_VERSION         0x03060400
 
 /* Configuration file to build mbed TLS with the required features for TFTF */
 #define MBEDTLS_PLATFORM_MEMORY