diff --git a/CMakeLists.txt b/CMakeLists.txt
index 99f636fa..831c0f8a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -134,7 +134,24 @@ if(MSVC AND MSVC_VERSION LESS 1800)
 endif(MSVC AND MSVC_VERSION LESS 1800)
 
 if(CONFIG_USE_EXTERNAL_MBEDTLS_DYNLIB)
+
+if(EXISTS "${CONFIG_EXTERNAL_MBEDTLS_INCLUDE_PATH}/mbedtls/build_info.h")
+
+file (READ "${CONFIG_EXTERNAL_MBEDTLS_INCLUDE_PATH}/mbedtls/build_info.h" MBEDTLS_VERSION_FILE)
+
+string (FIND "${MBEDTLS_VERSION_FILE}" "Mbed TLS 3.6." matchresult)
+
+if(${matchresult} EQUAL -1)
+    set(WITH_MBEDTLS 1)
+else()
+    set(WITH_MBEDTLS3 1)
+    message("Using external mbedtls 3.6.x")
+endif ()
+
+else()
 set(WITH_MBEDTLS 1)
+endif(EXISTS "${CONFIG_EXTERNAL_MBEDTLS_INCLUDE_PATH}/mbedtls/build_info.h")
+
 set(USE_PREBUILD_MBEDTLS 1)
 set(MBEDTLS_INCLUDE_DIR ${CONFIG_EXTERNAL_MBEDTLS_INCLUDE_PATH})
 endif(CONFIG_USE_EXTERNAL_MBEDTLS_DYNLIB)