diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4e7145a1..49ae6fc5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -386,7 +386,7 @@ if(CRYPTO_BACKEND STREQUAL "mbedTLS" OR NOT CRYPTO_BACKEND)
   if(MBEDTLS_FOUND)
     set(CRYPTO_BACKEND "mbedTLS")
     set(CRYPTO_BACKEND_DEFINE "LIBSSH2_MBEDTLS")
-    set(CRYPTO_BACKEND_INCLUDE_DIR ${MBEDTLS_INCLUDE_DIR})
+    set(CRYPTO_BACKEND_INCLUDE_DIR ${MBEDTLS_INCLUDE_DIRS})
     list(APPEND LIBRARIES ${MBEDTLS_LIBRARIES})
     list(APPEND LIBSSH2_PC_LIBS_PRIVATE "-lmbedcrypto")
     list(APPEND LIBSSH2_PC_REQUIRES_PRIVATE "mbedcrypto")
diff --git a/cmake/FindmbedTLS.cmake b/cmake/FindmbedTLS.cmake
index 4dff9bb4..8614d109 100644
--- a/cmake/FindmbedTLS.cmake
+++ b/cmake/FindmbedTLS.cmake
@@ -27,8 +27,9 @@ find_package_handle_standard_args(mbedTLS
   VERSION_VAR MBEDTLS_VERSION)
 
 if(MBEDTLS_FOUND)
-  set(MBEDTLS_LIBRARIES "${MBEDCRYPTO_LIBRARY}")
+  set(MBEDTLS_INCLUDE_DIRS ${MBEDTLS_INCLUDE_DIR})
+  set(MBEDTLS_LIBRARIES    ${MBEDCRYPTO_LIBRARY})
   message(STATUS "Found mbedTLS libraries: ${MBEDTLS_LIBRARIES}")
 endif()
 
-mark_as_advanced(MBEDTLS_INCLUDE_DIR MBEDCRYPTO_LIBRARY MBEDTLS_LIBRARIES)
+mark_as_advanced(MBEDTLS_INCLUDE_DIR MBEDCRYPTO_LIBRARY)