diff --git a/extra/clang/build b/extra/clang/build
index c5afd9f6..d8b7cd09 100755
--- a/extra/clang/build
+++ b/extra/clang/build
@@ -2,6 +2,7 @@
 
 export DESTDIR="$1"
 
+cd clang
 cmake -B build \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_BUILD_TYPE=Release \
diff --git a/extra/clang/checksums b/extra/clang/checksums
index 63b12a4e..513b486a 100644
--- a/extra/clang/checksums
+++ b/extra/clang/checksums
@@ -1 +1,2 @@
-d2b8daa737ed11765943ed655b8202142bd45ae22d7156f92892e81dd2312161be
+d1317a5046d9fe3bb3eb4b664eda8df7eebbbf039d9ddcc13ee7a4097ad852ff80
+fbaa3b1e1f3b0d75ad79f54878ea950be3ed7e31fa0b1f02c639ac052e4dabe0ef
diff --git a/extra/clang/sources b/extra/clang/sources
index 02b0e730..045d43ac 100644
--- a/extra/clang/sources
+++ b/extra/clang/sources
@@ -1 +1,2 @@
-https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/clang-15.0.7.src.tar.xz
+https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.6/clang-16.0.6.src.tar.xz clang
+https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.6/cmake-16.0.6.src.tar.xz cmake
diff --git a/extra/clang/version b/extra/clang/version
index e5547f52..32bec231 100644
--- a/extra/clang/version
+++ b/extra/clang/version
@@ -1 +1 @@
-15.0.7 1
+16.0.6 1
diff --git a/extra/llvm/build b/extra/llvm/build
index 339e5172..6bee4a51 100755
--- a/extra/llvm/build
+++ b/extra/llvm/build
@@ -2,8 +2,7 @@
 
 export DESTDIR="$1"
 
-mv Modules/* cmake/modules/
-
+cd llvm
 cmake -B build \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_BUILD_TYPE=Release \
diff --git a/extra/llvm/checksums b/extra/llvm/checksums
index 8ca0dbe5..cf96e16e 100644
--- a/extra/llvm/checksums
+++ b/extra/llvm/checksums
@@ -1,2 +1,2 @@
-7f46862f4dd9fc04559c404fef89234e67266eac3dc8f85f39e2da6e9c1a7fb96b
-5e5ce50f196bcccd6f8b044bd1b2424fc11c57f04dac5a033bab5b0f573cd9824f
+8ccc099f4f025c936b4b9b4a2f821f2f54172822ce8580b28811c72c6138d31ffd
+fbaa3b1e1f3b0d75ad79f54878ea950be3ed7e31fa0b1f02c639ac052e4dabe0ef
diff --git a/extra/llvm/sources b/extra/llvm/sources
index e5d343ad..ed23b9a8 100644
--- a/extra/llvm/sources
+++ b/extra/llvm/sources
@@ -1,2 +1,2 @@
-https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-15.0.7.src.tar.xz
-https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/cmake-15.0.7.src.tar.xz
+https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.6/llvm-16.0.6.src.tar.xz llvm
+https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.6/cmake-16.0.6.src.tar.xz cmake
diff --git a/extra/llvm/version b/extra/llvm/version
index e5547f52..32bec231 100644
--- a/extra/llvm/version
+++ b/extra/llvm/version
@@ -1 +1 @@
-15.0.7 1
+16.0.6 1