diff --git a/Documentation/releases/coreboot-4.21-relnotes.md b/Documentation/releases/coreboot-4.21-relnotes.md
index a57b456..82e30ab 100644
--- a/Documentation/releases/coreboot-4.21-relnotes.md
+++ b/Documentation/releases/coreboot-4.21-relnotes.md
@@ -23,7 +23,7 @@
 ### Toolchain updates
 
 * Upgrade IASL from 20221020 to 20230331
-* Upgrade LLVM from 15.0.7 to 16.0.4
+* Upgrade LLVM from 15.0.7 to 16.0.5
 * Upgrade nasm from 2.15.05 to 2.16.01
 * Upgrade CMake from 3.26.3 to 3.26.4
 
diff --git a/util/crossgcc/buildgcc b/util/crossgcc/buildgcc
index 6447cdc..9f86995 100755
--- a/util/crossgcc/buildgcc
+++ b/util/crossgcc/buildgcc
@@ -41,7 +41,7 @@
 BINUTILS_VERSION=2.40
 IASL_VERSION=20230331
 # CLANG version number
-CLANG_VERSION=16.0.4
+CLANG_VERSION=16.0.5
 CMAKE_VERSION=3.26.4
 NASM_VERSION=2.16.01
 
diff --git a/util/crossgcc/sum/clang-16.0.4.src.tar.xz.cksum b/util/crossgcc/sum/clang-16.0.4.src.tar.xz.cksum
deleted file mode 100644
index 2173ff6..0000000
--- a/util/crossgcc/sum/clang-16.0.4.src.tar.xz.cksum
+++ /dev/null
@@ -1 +0,0 @@
-32a497da79d7d19dd48e840128423f8b68c3b1b7  tarballs/clang-16.0.4.src.tar.xz
diff --git a/util/crossgcc/sum/clang-16.0.5.src.tar.xz.cksum b/util/crossgcc/sum/clang-16.0.5.src.tar.xz.cksum
new file mode 100644
index 0000000..04f2648
--- /dev/null
+++ b/util/crossgcc/sum/clang-16.0.5.src.tar.xz.cksum
@@ -0,0 +1 @@
+ad47162ae20fdd85e2db27e1a00a989c88dcacbe  tarballs/clang-16.0.5.src.tar.xz
diff --git a/util/crossgcc/sum/clang-tools-extra-16.0.4.src.tar.xz.cksum b/util/crossgcc/sum/clang-tools-extra-16.0.4.src.tar.xz.cksum
deleted file mode 100644
index 40afb52..0000000
--- a/util/crossgcc/sum/clang-tools-extra-16.0.4.src.tar.xz.cksum
+++ /dev/null
@@ -1 +0,0 @@
-9115491127500d6913e4f042293f088f522f8aea  tarballs/clang-tools-extra-16.0.4.src.tar.xz
diff --git a/util/crossgcc/sum/clang-tools-extra-16.0.5.src.tar.xz.cksum b/util/crossgcc/sum/clang-tools-extra-16.0.5.src.tar.xz.cksum
new file mode 100644
index 0000000..8e5cd8c
--- /dev/null
+++ b/util/crossgcc/sum/clang-tools-extra-16.0.5.src.tar.xz.cksum
@@ -0,0 +1 @@
+38f9ca678f40617f760b4da5795e92be0e6d573b  tarballs/clang-tools-extra-16.0.5.src.tar.xz
diff --git a/util/crossgcc/sum/cmake-16.0.4.src.tar.xz.cksum b/util/crossgcc/sum/cmake-16.0.4.src.tar.xz.cksum
deleted file mode 100644
index cb1ae99..0000000
--- a/util/crossgcc/sum/cmake-16.0.4.src.tar.xz.cksum
+++ /dev/null
@@ -1 +0,0 @@
-4d042fe6ccff719da5bcf8bab977050a1f2b3c77  tarballs/cmake-16.0.4.src.tar.xz
diff --git a/util/crossgcc/sum/cmake-16.0.5.src.tar.xz.cksum b/util/crossgcc/sum/cmake-16.0.5.src.tar.xz.cksum
new file mode 100644
index 0000000..d78ef2d
--- /dev/null
+++ b/util/crossgcc/sum/cmake-16.0.5.src.tar.xz.cksum
@@ -0,0 +1 @@
+3330310405697793ec3d24a63233e22713e1c808  tarballs/cmake-16.0.5.src.tar.xz
diff --git a/util/crossgcc/sum/compiler-rt-16.0.4.src.tar.xz.cksum b/util/crossgcc/sum/compiler-rt-16.0.4.src.tar.xz.cksum
deleted file mode 100644
index 58ac022..0000000
--- a/util/crossgcc/sum/compiler-rt-16.0.4.src.tar.xz.cksum
+++ /dev/null
@@ -1 +0,0 @@
-d19f56f8bd675f496d78c63ac4011795bc1eafe0  tarballs/compiler-rt-16.0.4.src.tar.xz
diff --git a/util/crossgcc/sum/compiler-rt-16.0.5.src.tar.xz.cksum b/util/crossgcc/sum/compiler-rt-16.0.5.src.tar.xz.cksum
new file mode 100644
index 0000000..72c7ae4
--- /dev/null
+++ b/util/crossgcc/sum/compiler-rt-16.0.5.src.tar.xz.cksum
@@ -0,0 +1 @@
+6db2ebf9a345a8e42011888359de65aea37c75ba  tarballs/compiler-rt-16.0.5.src.tar.xz
diff --git a/util/crossgcc/sum/llvm-16.0.4.src.tar.xz.cksum b/util/crossgcc/sum/llvm-16.0.4.src.tar.xz.cksum
deleted file mode 100644
index 0089f25..0000000
--- a/util/crossgcc/sum/llvm-16.0.4.src.tar.xz.cksum
+++ /dev/null
@@ -1 +0,0 @@
-90c3e2ba2855eae6997e4074347417b93786838d  tarballs/llvm-16.0.4.src.tar.xz
diff --git a/util/crossgcc/sum/llvm-16.0.5.src.tar.xz.cksum b/util/crossgcc/sum/llvm-16.0.5.src.tar.xz.cksum
new file mode 100644
index 0000000..84e1e56
--- /dev/null
+++ b/util/crossgcc/sum/llvm-16.0.5.src.tar.xz.cksum
@@ -0,0 +1 @@
+ce2c4a55b249a3076e89c31d920f06a65510c4dc  tarballs/llvm-16.0.5.src.tar.xz