diff --git a/ports/mbedtls/enable-pthread.patch b/ports/mbedtls/enable-pthread.patch
index 55e742c1a8..67c2dde8b5 100755
--- a/ports/mbedtls/enable-pthread.patch
+++ b/ports/mbedtls/enable-pthread.patch
@@ -1,5 +1,5 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index b001bb7..a5e0479 100644
+index b001bb7..b9fb566 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -44,6 +44,7 @@ set(MBEDTLS_DIR ${CMAKE_CURRENT_SOURCE_DIR})
@@ -58,11 +58,11 @@ index 11b417b..5ca44c3 100644
          DESTINATION include/mbedtls
          PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ)
 diff --git a/include/mbedtls/config.h b/include/mbedtls/config.h
-index 7b1f38a..5f29ba5 100644
+index ac2146e..4cd831a 100644
 --- a/include/mbedtls/config.h
 +++ b/include/mbedtls/config.h
-@@ -24,6 +24,8 @@
-  *  limitations under the License.
+@@ -12,6 +12,8 @@
+  *  SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
   */
  
 +#include "mbedtls/config_threading.h"
@@ -84,7 +84,7 @@ index 0000000..9d5d42e
 +#endif
 \ No newline at end of file
 diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt
-index 8d88101..2ba764c 100644
+index 1b2980d..8c495fe 100644
 --- a/library/CMakeLists.txt
 +++ b/library/CMakeLists.txt
 @@ -149,7 +149,11 @@ if(ENABLE_ZLIB_SUPPORT)
diff --git a/ports/mbedtls/portfile.cmake b/ports/mbedtls/portfile.cmake
index efb1fcdf72..eb6398162e 100644
--- a/ports/mbedtls/portfile.cmake
+++ b/ports/mbedtls/portfile.cmake
@@ -4,7 +4,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO ARMmbed/mbedtls
     REF "v${VERSION}"
-    SHA512 7b19dff013910b5300662d48be5adb0e7c4d2c54b79116992642e5c9850cd62a14aea69b121458d3441154e3f2a13fd9a33ad86a26f17e4d94a872970ea841e0
+    SHA512 b61dd319606c88c834b3a8e8f9f85e68a22b6b21ca177b340a972dfabe9efee984b8a9f6ed5d3b1829f229c689394e9f393b94efb38d82bda3a1e53d1e7a2861
     HEAD_REF mbedtls-2.28
     PATCHES
         enable-pthread.patch
diff --git a/ports/mbedtls/vcpkg.json b/ports/mbedtls/vcpkg.json
index 9d0648eec6..17803e7c3a 100644
--- a/ports/mbedtls/vcpkg.json
+++ b/ports/mbedtls/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "mbedtls",
-  "version": "2.28.5",
+  "version": "2.28.7",
   "description": "An open source, portable, easy to use, readable and flexible SSL library",
   "homepage": "https://github.com/ARMmbed/mbedtls",
   "license": "Apache-2.0",
diff --git a/versions/baseline.json b/versions/baseline.json
index 900c3914a0..f57673aa47 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -5529,7 +5529,7 @@
       "port-version": 2
     },
     "mbedtls": {
-      "baseline": "2.28.5",
+      "baseline": "2.28.7",
       "port-version": 0
     },
     "mchehab-zbar": {
diff --git a/versions/m-/mbedtls.json b/versions/m-/mbedtls.json
index b40c8e93a2..b9d58e07ac 100644
--- a/versions/m-/mbedtls.json
+++ b/versions/m-/mbedtls.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "b8ca11fc0285875347dc1203913af7f84f9c7cad",
+      "version": "2.28.7",
+      "port-version": 0
+    },
     {
       "git-tree": "909516904f06e3379f7ac434b967cb165d8020c2",
       "version": "2.28.5",