diff --git a/etc/mtree/BSD.usr.dist b/etc/mtree/BSD.usr.dist
--- a/etc/mtree/BSD.usr.dist
+++ b/etc/mtree/BSD.usr.dist
@@ -242,8 +242,8 @@
             ..
             legal
             ..
-            llvm
-                clang
+            llvm            tags=package=clang
+                clang       tags=package=clang
                 ..
             ..
             ncurses
diff --git a/share/doc/llvm/Makefile b/share/doc/llvm/Makefile
--- a/share/doc/llvm/Makefile
+++ b/share/doc/llvm/Makefile
@@ -1,5 +1,7 @@
 SUBDIR=		clang
 
+PACKAGE=	clang
+
 SRCDIR=		${SRCTOP}/contrib/llvm-project/llvm
 
 .PATH: ${SRCDIR} ${SRCDIR}/lib/Support
diff --git a/share/doc/llvm/Makefile.inc b/share/doc/llvm/Makefile.inc
new file mode 100644
--- /dev/null
+++ b/share/doc/llvm/Makefile.inc
@@ -0,0 +1 @@
+PACKAGE?=	clang