diff --git a/srcpkgs/llvm10/template b/srcpkgs/llvm10/template
index 441a20345d..c4ddcf123f 100644
--- a/srcpkgs/llvm10/template
+++ b/srcpkgs/llvm10/template
@@ -1,7 +1,7 @@
 # Template file for 'llvm10'
 pkgname=llvm10
 version=10.0.0
-revision=1
+revision=2
 wrksrc="llvm-${version}.src"
 build_style=cmake
 configure_args="
@@ -206,7 +206,12 @@ clang-tools-extra_package() {
 		vmove usr/bin/clang-query
 		vmove usr/bin/clang-rename
 		vmove usr/bin/clang-tidy
+		vmove usr/bin/diagtool
+		vmove usr/bin/find-all-symbols
+		vmove usr/bin/hmaptool
 		vmove usr/bin/modularize
+		vmove usr/bin/pp-trace
+		vmove usr/bin/sancov
 		vmove "usr/lib/libclangApplyReplacements*"
 		vmove "usr/lib/libclangQuery*"
 		vmove "usr/lib/libclangTidy*"
@@ -216,11 +221,7 @@ clang-tools-extra_package() {
 
 clang_package() {
 	lib32disabled=yes
-	depends="libstdc++-devel libgcc-devel binutils"
-	case "$XBPS_TARGET_MACHINE" in
-		*-musl) depends+=" musl-devel";;
-		*) depends+=" glibc-devel";;
-	esac
+	depends="libstdc++-devel libgcc-devel binutils ${XBPS_TARGET_LIBC}-devel"
 	short_desc+=" - C language family frontend"
 	homepage="https://clang.llvm.org/"
 	pkg_install() {