diff --git a/common/shlibs b/common/shlibs
index 99a9a0878a9..b89c51e8a95 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2294,9 +2294,9 @@ librrd_th.so.4 rrdtool-1.4.9_1
 libmosquitto.so.1 libmosquitto-1.6.3_5
 libmosquittopp.so.1 libmosquittopp-1.6.3_5
 libmpv.so.2 mpv-0.35.0_1
-libmbedtls.so.12 mbedtls-2.13.1_1
-libmbedcrypto.so.3 mbedtls-2.9.0_1
-libmbedx509.so.0 mbedtls-2.9.0_1
+libmbedtls.so.21 mbedtls-3.6.0_1
+libmbedcrypto.so.16 mbedtls-3.6.0_1
+libmbedx509.so.7 mbedtls-3.6.0_1
 libdmtx.so.0 libdmtx-0.7.4_1
 libdbus-c++-1.so.0 libdbus-c++-0.9.0_1
 libdbus-c++-glib-1.so.0 libdbus-c++-0.9.0_1
diff --git a/srcpkgs/mbedtls/template b/srcpkgs/mbedtls/template
index ac910923171..a9fd561fd78 100644
--- a/srcpkgs/mbedtls/template
+++ b/srcpkgs/mbedtls/template
@@ -1,8 +1,8 @@
 # Template file for 'mbedtls'
 pkgname=mbedtls
-reverts="2.17.0_1"
-version=2.16.12
+version=3.6.0
 revision=1
+_framework_ver=750634d3a51eb9d61b59fd5d801546927c946588
 build_style=cmake
 configure_args="-DENABLE_TESTING=1 -DUSE_SHARED_MBEDTLS_LIBRARY=1"
 hostmakedepends="python3 perl"
@@ -11,8 +11,15 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://tls.mbed.org/"
 changelog="https://raw.githubusercontent.com/ARMmbed/mbedtls/mbedtls-${version%.*}/ChangeLog"
-distfiles="https://github.com/ARMmbed/mbedtls/archive/refs/tags/v${version}.tar.gz"
-checksum=294871ab1864a65d0b74325e9219d5bcd6e91c34a3c59270c357bb9ae4d5c393
+distfiles="https://github.com/ARMmbed/mbedtls/archive/refs/tags/v${version}.tar.gz
+ https://github.com/Mbed-TLS/mbedtls-framework/archive/${_framework_ver}.tar.gz>framework-${_framework_ver}.tar.gz"
+checksum="32c500e73ee878e193e7d66bf5e4c34fb42bb968a6c9f9488aa466b16f6f3bff
+ 4845b5ae123c036cf9ec9e0ff0478a24b2be95450fc36a0fb80e2748518b424f"
+skip_extraction="framework-${_framework_ver}.tar.gz"
+
+post_extract() {
+	vsrcextract -C framework "framework-${_framework_ver}.tar.gz"
+}
 
 pre_configure() {
 	./scripts/config.pl set MBEDTLS_THREADING_C
@@ -24,6 +31,7 @@ mbedtls-utils_package() {
 	depends="${sourcepkg}-${version}_${revision}"
 	pkg_install() {
 		vmove usr/bin
+		rm "${PKGDESTDIR}"/usr/bin/hello
 		rm "${PKGDESTDIR}"/usr/bin/query_compile_time_config
 	}
 }
@@ -31,9 +39,13 @@ mbedtls-utils_package() {
 mbedtls-devel_package() {
 	short_desc+=" - development files"
 	depends="${sourcepkg}-${version}_${revision}"
+	conflicts="mbedtls2-devel>=0"
+	replaces="mbedtls2-devel>=0"
 	pkg_install() {
 		vmove usr/include
 		vmove "usr/lib/*.a"
 		vmove "usr/lib/*.so"
+		vmove usr/lib/pkgconfig
+		vmove usr/lib/cmake
 	}
 }