diff --git a/ports/mbedtls/portfile.cmake b/ports/mbedtls/portfile.cmake
index e7d4b31575..35c1d5bb36 100644
--- a/ports/mbedtls/portfile.cmake
+++ b/ports/mbedtls/portfile.cmake
@@ -6,7 +6,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Mbed-TLS/mbedtls
     REF "v${VERSION}"
-    SHA512 ad5a8de072cd7bede21378a3301d8de7c4eec8e113ebe2a3ffe5bf8ebed1b236a52ae0425abe45eafdc534af65b51076ca458e342950174bf1bdbbc06d1bdad1
+    SHA512 67c0ec7824e1ffa3e4f8d02814201776f8c1b2dc0fb8f1f9246495e27a2c03b8c248eff00e8da3e206625b7d0aa82d38cf7ddfd9ed8b4623375b05dc1ecc0677
     HEAD_REF development
     PATCHES
         enable-pthread.patch
diff --git a/ports/mbedtls/vcpkg.json b/ports/mbedtls/vcpkg.json
index fb750fe605..780335edd8 100644
--- a/ports/mbedtls/vcpkg.json
+++ b/ports/mbedtls/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "mbedtls",
-  "version": "3.6.2",
+  "version": "3.6.4",
   "description": "An open source, portable, easy to use, readable and flexible SSL library",
   "homepage": "https://www.trustedfirmware.org/projects/mbed-tls/",
   "license": "Apache-2.0 OR GPL-2.0-or-later",
diff --git a/versions/baseline.json b/versions/baseline.json
index 73a0b1186c..a2a22a627f 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -6097,7 +6097,7 @@
       "port-version": 2
     },
     "mbedtls": {
-      "baseline": "3.6.2",
+      "baseline": "3.6.4",
       "port-version": 0
     },
     "mchehab-zbar": {
diff --git a/versions/m-/mbedtls.json b/versions/m-/mbedtls.json
index 6c7b04a859..8250ba5812 100644
--- a/versions/m-/mbedtls.json
+++ b/versions/m-/mbedtls.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "70ebeccc1908660a6f2afabf001b9790b52482ef",
+      "version": "3.6.4",
+      "port-version": 0
+    },
     {
       "git-tree": "5312822288313d76c7e852e2577da58b0c169c21",
       "version": "3.6.2",