diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc
index 45b0a27865f..77ae362208f 100644
--- a/tools/build/mk/OptionalObsoleteFiles.inc
+++ b/tools/build/mk/OptionalObsoleteFiles.inc
@@ -2466,6 +2466,12 @@ OLD_FILES+=usr/bin/gcov
 OLD_FILES+=usr/share/man/man1/gcov.1.gz
 .endif
 
+.if ${MK_LLVM_COV} == no
+OLD_FILES+=usr/bin/llvm-cov
+OLD_FILES+=usr/bin/llvm-profdata
+OLD_FILES+=usr/share/man/man1/llvm-cov.1.gz
+.endif
+
 .if ${MK_GDB} == no || ${MK_GDB_LIBEXEC} == yes
 OLD_FILES+=usr/bin/gdb
 OLD_FILES+=usr/bin/gdbserver
diff --git a/usr.bin/clang/Makefile b/usr.bin/clang/Makefile
index 9d081c0fdda..2054657186b 100644
--- a/usr.bin/clang/Makefile
+++ b/usr.bin/clang/Makefile
@@ -31,7 +31,6 @@ SUBDIR+=	llvm-modextract
 SUBDIR+=	llvm-nm
 SUBDIR+=	llvm-objcopy
 SUBDIR+=	llvm-pdbutil
-SUBDIR+=	llvm-profdata
 SUBDIR+=	llvm-rtdyld
 SUBDIR+=	llvm-symbolizer
 SUBDIR+=	llvm-xray
@@ -46,6 +45,7 @@ SUBDIR+=	lldb
 .endif
 .if ${MK_LLVM_COV} != "no"
 SUBDIR+=	llvm-cov
+SUBDIR+=	llvm-profdata
 .endif
 .endif # TOOLS_PREFIX