diff --git a/mingw-w64-mbedtls/PKGBUILD b/mingw-w64-mbedtls/PKGBUILD
index 9eb4ae064c..d989d61f37 100644
--- a/mingw-w64-mbedtls/PKGBUILD
+++ b/mingw-w64-mbedtls/PKGBUILD
@@ -3,8 +3,8 @@
 _realname=mbedtls
 pkgbase="mingw-w64-${_realname}"
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
-pkgver=3.5.2
-pkgrel=2
+pkgver=3.6.0
+pkgrel=1
 pkgdesc="Portable cryptographic and SSL/TLS library, aka polarssl (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw64' 'ucrt64' 'clang64')
@@ -20,16 +20,12 @@ depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs"
 makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
              "${MINGW_PACKAGE_PREFIX}-cmake"
              "${MINGW_PACKAGE_PREFIX}-ninja")
-source=("https://github.com/ARMmbed/mbedtls/archive/v${pkgver}/${_realname}-${pkgver}.tar.gz"
-        "https://github.com/Mbed-TLS/mbedtls/commit/a4d17b34f354557838e05d2cb47200e8dcaaf59b.patch"
-        "https://github.com/Mbed-TLS/mbedtls/commit/aab7f7f517c01e8d21ff0fb72fdd10378f5a0073.patch"
+source=("https://github.com/Mbed-TLS/mbedtls/releases/download/v${pkgver}/mbedtls-${pkgver}.tar.bz2"
         '0001-mbedtls-pkgconfig-add-bcrypt.patch'
         'enable-features.patch')
-sha256sums=('35890edf1a2c7a7e29eac3118d43302c3e1173e0df0ebaf5db56126dabe5bb05'
-            'bcb05d33186ef37ee46237fe22abc78982300121c6e70b3502766dd4013ffabe'
-            'd5e628142d44fb3798dab756c32fd1904391e5639f47cabaa6b4356d7cad6610'
+sha256sums=('3ecf94fcfdaacafb757786a01b7538a61750ebd85c4b024f56ff8ba1490fcd38'
             '52e951aab864c2a4616214bb72f29d5b9558f58c8b8ccc0ef2acb8d6ada65d9c'
-            'e8ccbbdb60323ebb9f25aa54b1e7b60b5d2f17d30d27dd20c349951fe55dd620')
+            '8198722473c24d4d7005d24d1ac0cf76df23a9d783ce48a205ad5b4ed782b04c')
 
 apply_patch_with_msg() {
   for _patch in "$@"
@@ -42,8 +38,6 @@ apply_patch_with_msg() {
 prepare() {
   cd "${srcdir}/${_realname}-${pkgver}"
   apply_patch_with_msg \
-    a4d17b34f354557838e05d2cb47200e8dcaaf59b.patch \
-    aab7f7f517c01e8d21ff0fb72fdd10378f5a0073.patch \
     0001-mbedtls-pkgconfig-add-bcrypt.patch \
     enable-features.patch
 }
@@ -63,6 +57,7 @@ build() {
   ${MINGW_PREFIX}/bin/cmake.exe \
     -G "Ninja" \
     "${_extra_config[@]}" \
+    -DCMAKE_DLL_NAME_WITH_SOVERSION=ON \
     -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
     -DPython3_EXECUTABLE=${MINGW_PREFIX}/bin/python.exe \
     -DENABLE_PROGRAMS=ON \
diff --git a/mingw-w64-mbedtls/enable-features.patch b/mingw-w64-mbedtls/enable-features.patch
index 4662be1c68..cc218683ca 100644
--- a/mingw-w64-mbedtls/enable-features.patch
+++ b/mingw-w64-mbedtls/enable-features.patch
@@ -1,6 +1,6 @@
 --- a/include/mbedtls/mbedtls_config.h
 +++ b/include/mbedtls/mbedtls_config.h
-@@ -120,7 +120,7 @@
+@@ -108,7 +108,7 @@
   *
   * Uncomment if the CPU supports SSE2 (IA-32 specific).
   */
@@ -9,7 +9,7 @@
  
  /**
   * \def MBEDTLS_HAVE_TIME
-@@ -252,7 +252,7 @@
+@@ -315,7 +315,7 @@
   *
   * Uncomment to get warnings on using deprecated functions and features.
   */
@@ -18,7 +18,7 @@
  
  /**
   * \def MBEDTLS_DEPRECATED_REMOVED
-@@ -1029,7 +1029,7 @@
+@@ -1167,7 +1167,7 @@
   * Disable if you run into name conflicts and want to really remove the
   * mbedtls_strerror()
   */
@@ -27,7 +27,7 @@
  
  /**
   * \def MBEDTLS_GENPRIME
-@@ -1917,7 +1917,7 @@
+@@ -2090,7 +2090,7 @@
   *
   * Uncomment this to enable pthread mutexes.
   */
@@ -36,9 +36,9 @@
  
  /**
   * \def MBEDTLS_USE_PSA_CRYPTO
-@@ -3312,7 +3312,7 @@
+@@ -3609,7 +3609,7 @@
   *
-  * Enable this layer to allow use of mutexes within mbed TLS
+  * Enable this layer to allow use of mutexes within Mbed TLS
   */
 -//#define MBEDTLS_THREADING_C
 +#define MBEDTLS_THREADING_C