diff --git a/mingw-w64-cross-clang/PKGBUILD b/mingw-w64-cross-clang/PKGBUILD
index 418e871a..a0abcaf2 100644
--- a/mingw-w64-cross-clang/PKGBUILD
+++ b/mingw-w64-cross-clang/PKGBUILD
@@ -3,14 +3,14 @@
 _realname=clang
 _mingw_suff=mingw-w64-cross
 pkgname=("${_mingw_suff}-${_realname}")
-pkgver=20.1.8
+pkgver=21.1.1
 pkgrel=1
 pkgdesc="Cross Clang for the MinGW-w64"
 groups=("${_mingw_suff}-${_realname}-toolchain")
 arch=('i686' 'x86_64')
 url="https://llvm.org"
 license=("spdx:Apache-2.0 WITH LLVM-exception")
-depends=('mingw-w64-cross-clang-crt' 'mingw-w64-cross-compiler-rt')
+depends=('llvm' 'mingw-w64-cross-clang-crt' 'mingw-w64-cross-compiler-rt')
 makedepends=("clang" "cmake" "lld" "ninja" "python")
 options=('!strip' 'staticlibs' '!emptydirs' '!buildflags')
 msys2_references=(
@@ -19,7 +19,7 @@ msys2_references=(
 )
 _url=https://github.com/llvm/llvm-project/releases/download/llvmorg-${pkgver}
 source=("${_url}/llvm-project-${pkgver}.src.tar.xz"{,.sig})
-sha256sums=('6898f963c8e938981e6c4a302e83ec5beb4630147c7311183cf61069af16333d'
+sha256sums=('8863980e14484a72a9b7d2c80500e1749054d74f08f8c5102fd540a3c5ac9f8a'
             'SKIP')
 validpgpkeys=('B6C8F98282B944E3B0D5C2530FC3042E345AD05D'  # Hans Wennborg, Google.
               '474E22316ABF4785A88C6E8EA2C794A986419D8A'  # Tom Stellard
diff --git a/mingw-w64-cross-compiler-rt/PKGBUILD b/mingw-w64-cross-compiler-rt/PKGBUILD
index 48f0bc3d..94ef641c 100644
--- a/mingw-w64-cross-compiler-rt/PKGBUILD
+++ b/mingw-w64-cross-compiler-rt/PKGBUILD
@@ -3,7 +3,7 @@
 _realname=compiler-rt
 _mingw_suff=mingw-w64-cross
 pkgname=("${_mingw_suff}-${_realname}")
-pkgver=20.1.8
+pkgver=21.1.1
 pkgrel=1
 pkgdesc="Compiler runtime libraries for cross clang"
 arch=('i686' 'x86_64')
@@ -14,14 +14,17 @@ msys2_references=(
   'cpe: cpe:/a:llvm:llvm'
 )
 depends=('clang')
-makedepends=("cmake" "lld" "ninja" "${_mingw_suff}-clang-headers" 'gcc' 'python')
+makedepends=("cmake" "lld" "llvm" "ninja" "${_mingw_suff}-clang-headers" 'gcc' 'python')
 options=('!strip' 'staticlibs' '!emptydirs' '!buildflags')
 _url=https://github.com/llvm/llvm-project/releases/download/llvmorg-${pkgver}
 source=("${_url}/${_realname}-${pkgver}.src.tar.xz"{,.sig}
-        "${_url}/cmake-${pkgver}.src.tar.xz"{,.sig})
-sha256sums=('15277402f6fd63397c0917a5c7171cda82d16d226094b828c1ed0f58f73b9c69'
+        "${_url}/cmake-${pkgver}.src.tar.xz"{,.sig}
+        "${_url}/third-party-${pkgver}.src.tar.xz"{,.sig})
+sha256sums=('f5e46d1734be28bc8ea83d0a5621a43388d349def91e37e6907609e5b67d1f8e'
             'SKIP'
-            '3319203cfd1172bbac50f06fa68e318af84dcb5d65353310c0586354069d6634'
+            '9c0b9064b7d0f2a3004f1d034aadf84d2af4e5dca2135ebf697b0a1eb85ef769'
+            'SKIP'
+            'e9b7299b0b32aa827231ed35101a3b5ea37dd5a45719225cb2c08ac571791233'
             'SKIP')
 validpgpkeys=('B6C8F98282B944E3B0D5C2530FC3042E345AD05D'  # Hans Wennborg, Google.
               '474E22316ABF4785A88C6E8EA2C794A986419D8A'  # Tom Stellard
@@ -33,6 +36,7 @@ prepare() {
   cd ${srcdir}
   rm -rf cmake
   mv cmake-$pkgver.src cmake
+  mv third-party-$pkgver.src third-party
 }
 
 build() {