diff --git a/mingw-w64-clang/0002-Fix-Findzstd-on-MINGW.patch b/mingw-w64-clang/0002-Fix-Findzstd-on-MINGW.patch
new file mode 100644
index 0000000000..108fb0e6a2
--- /dev/null
+++ b/mingw-w64-clang/0002-Fix-Findzstd-on-MINGW.patch
@@ -0,0 +1,16 @@
+--- a/cmake/modules/Findzstd.cmake
++++ b/cmake/modules/Findzstd.cmake
+@@ -29,11 +29,11 @@
+ )
+ 
+ if(zstd_FOUND)
+-  if(zstd_LIBRARY MATCHES "${zstd_STATIC_LIBRARY_SUFFIX}$")
++  if(zstd_LIBRARY MATCHES "${zstd_STATIC_LIBRARY_SUFFIX}$" AND NOT MINGW)
+     set(zstd_STATIC_LIBRARY "${zstd_LIBRARY}")
+   elseif (NOT TARGET zstd::libzstd_shared)
+     add_library(zstd::libzstd_shared SHARED IMPORTED)
+-    if(MSVC)
++    if(WIN32)
+       # IMPORTED_LOCATION is the path to the DLL and IMPORTED_IMPLIB is the "library".
+       get_filename_component(zstd_DIRNAME "${zstd_LIBRARY}" DIRECTORY)
+       string(REGEX REPLACE "${CMAKE_INSTALL_LIBDIR}$" "${CMAKE_INSTALL_BINDIR}" zstd_DIRNAME "${zstd_DIRNAME}")
diff --git a/mingw-w64-clang/PKGBUILD b/mingw-w64-clang/PKGBUILD
index cd109ee569..1f2ee73782 100644
--- a/mingw-w64-clang/PKGBUILD
+++ b/mingw-w64-clang/PKGBUILD
@@ -23,7 +23,7 @@ pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}"
          "${MINGW_PACKAGE_PREFIX}-lld"
          "${MINGW_PACKAGE_PREFIX}-llvm"
          "${MINGW_PACKAGE_PREFIX}-llvm-libs")
-_version=17.0.1
+_version=17.0.2
 _rc=
 _tag=llvmorg-${_version}${_rc}
 pkgver=${_version}${_rc/-/}
@@ -32,7 +32,7 @@ pkgdesc="C language family frontend for LLVM (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
 url="https://llvm.org/"
-license=("custom:Apache 2.0 with LLVM Exception")
+license=("spdx:Apache-2.0 WITH LLVM-exception")
 groups=($( (( _clangprefix )) && echo "${MINGW_PACKAGE_PREFIX}-toolchain"))
 makedepends=("${MINGW_PACKAGE_PREFIX}-cmake"
              "${MINGW_PACKAGE_PREFIX}-z3"
@@ -59,6 +59,7 @@ source=("${_url}/llvm-${pkgver}.src.tar.xz"{,.sig}
         "${_url}/cmake-${pkgver}.src.tar.xz"{,.sig}
         "${_url}/third-party-${pkgver}.src.tar.xz"{,.sig}
         "0001-Fix-GetHostTriple-for-mingw-w64-in-msys.patch"
+        "0002-Fix-Findzstd-on-MINGW.patch"
         "0003-add-pthread-as-system-lib-for-mingw.patch"
         "0004-enable-emutls-for-mingw.patch"
         "0101-link-pthread-with-mingw.patch"
@@ -70,21 +71,22 @@ source=("${_url}/llvm-${pkgver}.src.tar.xz"{,.sig}
 #0201-0299 -> rt
 #0301-0399 -> lld
 #0401-0499 -> clang-tools-extra
-sha256sums=('6acbd59b0a5156b61e82157915ee962a56e13d97aa5fcaa959b68809290893d1'
+sha256sums=('61dd9eaa1f874a10a51dc397b84998eaebdd3c55a5a5fa6c24b2081a435b47c6'
             'SKIP'
-            'af5dd15ff53dd6b483e64cac2f0a15fbbb7b80a672ed768f7ca30c781978ef39'
+            'ce1c16b766894b3281038e4b2c4280f1b8c42fd5cc95ba355bba0f5ff47e23fa'
             'SKIP'
-            '401caf1e8873f6bad3c4456e3052bded0f0f6b9701095c7cb926d52dd73682fa'
+            '7ed1dd0c2f8a37f5759d9a7954655f7fcad933cba9bdb6ea30f592b47cac4e44'
             'SKIP'
-            '438a7608c729defb45743219f23f6da35586f1293ee48a14b6deea2cc6744e4a'
+            '8053f53d3205f9758b03784c5d0cf8235ffe2f3fb7a946aea9c6aa5ff9b8d1a1'
             'SKIP'
-            '7652d5c368f3f7d7894aa3c20d5aa278759fc704d0c2bfd8d40f62f52c72ffbf'
+            'ccd46707b349f0e2bd8fe9eeb0ac5aa2ab1366a4939957dadab25dec14c68036'
             'SKIP'
-            '46e745d9bdcd2e18719a47b080e65fd476e1f6c4bbaa5947e4dee057458b78bc'
+            '07093ef3b47bc30c24c8ab4996dea8c89eb6f3c8f55cd43158000c61c1fd5075'
             'SKIP'
-            'ea7cc0781c3dba556bf7596f8283e62561fee3648880e27e1af7e0db4d34d918'
+            '058623c5859c99e6b6711e88c646e80778377ec8e596e1f0e24efb987e063aff'
             'SKIP'
             'eb03df53671df6627768141b3aaa76abe176a14e5e47911c97bec544387c4aff'
+            'd7d58ad5d0e77f2803070a8fb7f4138a6f49a2cbf30c55ff059c31f40ca6b65c'
             '7f0c64cd87b61e894be632f180ae5291e1aa9f1d9d382608f659067eeeda7146'
             '5f86e542dd1ec92b2fe06ee59061c3e23512df7bafabe82206f2b7d80b81836b'
             '715cb8862753854b2d9256e0b70003e2d1f57083d83eaeaf5a095fc72b8a4e26'
@@ -124,7 +126,8 @@ prepare() {
   # Patch llvm
   cd "${srcdir}/llvm"
   apply_patch_with_msg \
-    "0001-Fix-GetHostTriple-for-mingw-w64-in-msys.patch"
+    "0001-Fix-GetHostTriple-for-mingw-w64-in-msys.patch" \
+    "0002-Fix-Findzstd-on-MINGW.patch"
 
   if (( ! _clangprefix )); then
     apply_patch_with_msg \
diff --git a/mingw-w64-libc++/PKGBUILD b/mingw-w64-libc++/PKGBUILD
index d4fb7d7665..05d99e94a2 100644
--- a/mingw-w64-libc++/PKGBUILD
+++ b/mingw-w64-libc++/PKGBUILD
@@ -8,7 +8,7 @@ _realname=libc++
 pkgbase=mingw-w64-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}"
          "${MINGW_PACKAGE_PREFIX}-libunwind")
-_version=17.0.1
+_version=17.0.2
 _rc=
 _tag=llvmorg-${_version}${_rc}
 pkgver=${_version}${_rc/-/}
@@ -16,7 +16,7 @@ pkgrel=1
 url="https://libcxx.llvm.org/"
 arch=(any)
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
-license=("custom:Apache 2.0 with LLVM Exception")
+license=("spdx:Apache-2.0 WITH LLVM-exception")
 groups=($( (( _clangprefix )) && echo "${MINGW_PACKAGE_PREFIX}-toolchain"))
 makedepends=("${MINGW_PACKAGE_PREFIX}-clang"
              "${MINGW_PACKAGE_PREFIX}-cmake"
@@ -38,15 +38,15 @@ source=("${_url}/libcxx-${pkgver}.src.tar.xz"{,.sig}
         "https://raw.githubusercontent.com/llvm/llvm-project/${_tag}/runtimes/Components.cmake.in"
         "https://raw.githubusercontent.com/llvm/llvm-project/${_tag}/runtimes/cmake/Modules/HandleFlags.cmake"
         "https://raw.githubusercontent.com/llvm/llvm-project/${_tag}/runtimes/cmake/Modules/WarningFlags.cmake")
-sha256sums=('283950b108fd95b99a99a7fd6bd319cde0335187e74a1bf818c680e86dd89f09'
+sha256sums=('fe2b1c816ff4cbc06c89174c4e91cb98d85e6dc1cf09ecaaabf9bebe71a7ffc9'
             'SKIP'
-            '3b9465aaa340e7edcfe2bfae5ff128cc334f16743c21b2f9628e84d180f0c6e5'
+            'bbf71a2aeece988299b9ab84d9b1f283cfdf954ee3b7cfc0efafbd4ef37446b2'
             'SKIP'
-            'faacef65702ea1ce55410f7c7aa7193c1d488a777af7b4aea12d04d12c5619bb'
+            '252663ff79d67ba0c7832c1e13311fc42ffb561e2281195237718953987d66d7'
             'SKIP'
-            '6acbd59b0a5156b61e82157915ee962a56e13d97aa5fcaa959b68809290893d1'
+            '61dd9eaa1f874a10a51dc397b84998eaebdd3c55a5a5fa6c24b2081a435b47c6'
             'SKIP'
-            '46e745d9bdcd2e18719a47b080e65fd476e1f6c4bbaa5947e4dee057458b78bc'
+            '07093ef3b47bc30c24c8ab4996dea8c89eb6f3c8f55cd43158000c61c1fd5075'
             'SKIP'
             '9287553565f2ede6a7b8f392b275e437f644d16c8e01ec6a5ce708ad61bccd15'
             'bc0974b6555874d3c24295fe8b99b25aea8086158ee4ab87e9a8709191cc7824'
diff --git a/mingw-w64-polly/PKGBUILD b/mingw-w64-polly/PKGBUILD
index 7e372d3d7a..b0c6e73775 100644
--- a/mingw-w64-polly/PKGBUILD
+++ b/mingw-w64-polly/PKGBUILD
@@ -7,7 +7,7 @@ fi
 _realname=polly
 pkgbase=mingw-w64-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
-_version=17.0.1
+_version=17.0.2
 _rc=
 _tag=llvmorg-${_version}${_rc}
 pkgver=${_version}${_rc/-/}
@@ -16,7 +16,7 @@ pkgdesc="Polly - Polyhedral optimizations for LLVM (mingw-w64)"
 url="https://polly.llvm.org/"
 arch=(any)
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
-license=("custom:Apache 2.0 with LLVM Exception")
+license=("spdx:Apache-2.0 WITH LLVM-exception")
 groups=($( (( _clangprefix )) && echo "${MINGW_PACKAGE_PREFIX}-toolchain"))
 depends=("${MINGW_PACKAGE_PREFIX}-llvm")
 makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
@@ -28,9 +28,9 @@ _url=https://github.com/llvm/llvm-project/releases/download/${_tag}
 _pkgfn=$_realname-$pkgver.src
 source=($_url/$_pkgfn.tar.xz{,.sig}
         ${_url}/cmake-${pkgver}.src.tar.xz{,.sig})
-sha256sums=('7f5f7d791edefe6c53840c6aca64056be6a956f395b8ea2bc04d0d7cbbe0f6a3'
+sha256sums=('9adba0f39fbd667a36ce0f888ab94d5a2b372874547d8660d999f423ab9c50c0'
             'SKIP'
-            '46e745d9bdcd2e18719a47b080e65fd476e1f6c4bbaa5947e4dee057458b78bc'
+            '07093ef3b47bc30c24c8ab4996dea8c89eb6f3c8f55cd43158000c61c1fd5075'
             'SKIP')
 validpgpkeys=('B6C8F98282B944E3B0D5C2530FC3042E345AD05D'  # Hans Wennborg, Google.
               '474E22316ABF4785A88C6E8EA2C794A986419D8A'  # Tom Stellard