diff --git a/lld/.footprint b/lld/.footprint
index 3573e7246..02951d186 100644
--- a/lld/.footprint
+++ b/lld/.footprint
@@ -28,6 +28,7 @@ drwxr-xr-x	root/root	usr/lib/
 drwxr-xr-x	root/root	usr/lib/cmake/
 drwxr-xr-x	root/root	usr/lib/cmake/lld/
 -rw-r--r--	root/root	usr/lib/cmake/lld/LLDConfig.cmake
+-rw-r--r--	root/root	usr/lib/cmake/lld/LLDConfigVersion.cmake
 -rw-r--r--	root/root	usr/lib/cmake/lld/LLDTargets-release.cmake
 -rw-r--r--	root/root	usr/lib/cmake/lld/LLDTargets.cmake
 -rw-r--r--	root/root	usr/lib/liblldCOFF.a
diff --git a/lld/.signature b/lld/.signature
index dba66d8ba..135f705db 100644
--- a/lld/.signature
+++ b/lld/.signature
@@ -1,7 +1,7 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/dDUMRX1jP+7ZuwWGCNOtkt4kcCAbrcdKrkfvIb3J8Gs4amzqfyWY3bkwQsoV9n1xil3vEmgDVbuEjriA23Wngg=
-SHA256 (Pkgfile) = c2d99b13054bd467468d94d275953b6f657adfb5a20c1f0a314efcdeb19c57d2
-SHA256 (.footprint) = b491a5baf42a9784731248d9fc79dd9a48ffc369164a86f221e6b24e66ec71a4
-SHA256 (lld-15.0.7.src.tar.xz) = dba5c70c3fe88b3a38b9180df82fbc9d1dfd55d68f41fddd6a90f9e17f8e5df9
-SHA256 (cmake-15.0.7.src.tar.xz) = 8986f29b634fdaa9862eedda78513969fe9788301c9f2d938f4c10a3e7a3e7ea
+RWSE3ohX2g5d/Y32FHcTzxdxWtDYthsHwAy2pynzNZYkI5q4UagTmawCp98mMnri/GAp9Eyk+Eg40A9uYqFlHV7r1oRblyI94Q4=
+SHA256 (Pkgfile) = 7eb8a9baf7e65a19fcc75f82765654f85bbc03baa11975a3bb36af839eff72b1
+SHA256 (.footprint) = fcae37e3e90397ba8151436eec3d664113b6d3081f71ef05ec2eb871f7381087
+SHA256 (lld-16.0.4.src.tar.xz) = 83ca029906c887ece7094a484e8dc00ed6005d32b3192272af2cda239b587b53
+SHA256 (cmake-16.0.4.src.tar.xz) = 1a366c5f7a7a0efa2f7ede960717f26f5332df28adc9b3c47516a859de2ccf7b
 SHA256 (0002-PATCH-lld-Import-compact_unwind_encoding.h-from-libu.patch) = 3b18edef05d3a3fc0030b7a7674e455574dfbdecf26f23c6af5bd30e987b0f55
diff --git a/lld/Pkgfile b/lld/Pkgfile
index 083abe5a3..0482546d4 100644
--- a/lld/Pkgfile
+++ b/lld/Pkgfile
@@ -4,7 +4,7 @@
 # Depends on: llvm
 
 name=lld
-version=15.0.7
+version=16.0.4
 release=1
 source=(https://github.com/llvm/llvm-project/releases/download/llvmorg-$version/lld-$version.src.tar.xz
 	https://github.com/llvm/llvm-project/releases/download/llvmorg-$version/cmake-$version.src.tar.xz
@@ -13,7 +13,7 @@ source=(https://github.com/llvm/llvm-project/releases/download/llvmorg-$version/
 build() {
 	patch -d $name-$version.src -p2 -i $SRC/0002-PATCH-lld-Import-compact_unwind_encoding.h-from-libu.patch
 
-	cp -r $SRC/cmake-$version.src/Modules/* $name-$version.src/cmake/modules/.
+	mv cmake-$version.src cmake
 
 	cmake -S $name-$version.src -B build -G Ninja \
 		-D CMAKE_INSTALL_PREFIX=/usr \