diff --git a/doc/releases/release-notes-4.0.rst b/doc/releases/release-notes-4.0.rst
index fd732a4c543..9ff1fbffc6c 100644
--- a/doc/releases/release-notes-4.0.rst
+++ b/doc/releases/release-notes-4.0.rst
@@ -306,6 +306,9 @@ Libraries / Subsystems
 
 * Crypto
 
+  * Mbed TLS was updated to version 3.6.1. The release notes can be found at:
+    https://github.com/Mbed-TLS/mbedtls/releases/tag/mbedtls-3.6.1
+
 * CMSIS-NN
 
 * FPGA
diff --git a/west.yml b/west.yml
index 61e14685254..a6ad6071262 100644
--- a/west.yml
+++ b/west.yml
@@ -280,7 +280,7 @@ manifest:
       revision: 2b498e6f36d6b82ae1da12c8b7742e318624ecf5
       path: modules/lib/gui/lvgl
     - name: mbedtls
-      revision: 2f24831ee13d399ce019c4632b0bcd440a713f7c
+      revision: fb36f3fe20f9f62e67b1a20c0cfe0a6788ec2bf6
       path: modules/crypto/mbedtls
       groups:
         - crypto