Index: head/etc/mtree/Makefile
===================================================================
--- head/etc/mtree/Makefile	(revision 321445)
+++ head/etc/mtree/Makefile	(revision 321446)
@@ -1,34 +1,33 @@
 # $FreeBSD$
 
 .include <src.opts.mk>
 
-FILES=	${_BSD.debug.dist} \
+# NOTE: BSD.debug.dist is unconditionally installed for developer ease-of-use.
+FILES=	\
+	BSD.debug.dist \
 	BSD.include.dist \
 	BSD.root.dist \
 	${_BSD.lib32.dist} \
 	${_BSD.libsoft.dist} \
 	${_BSD.sendmail.dist} \
 	${_BSD.tests.dist} \
 	BSD.usr.dist \
 	BSD.var.dist
 
-.if ${MK_DEBUG_FILES} != "no"
-_BSD.debug.dist=	BSD.debug.dist
-.endif
 .if ${MK_LIB32} != "no"
 _BSD.lib32.dist=	BSD.lib32.dist
 .endif
 .if ${MK_LIBSOFT} != "no"
 _BSD.libsoft.dist=	BSD.libsoft.dist
 .endif
 .if ${MK_SENDMAIL} != "no"
 _BSD.sendmail.dist=	BSD.sendmail.dist
 .endif
 .if ${MK_TESTS} != "no"
 _BSD.tests.dist=	BSD.tests.dist
 .endif
 
 NO_OBJ=
 FILESDIR= /etc/mtree
 
 .include <bsd.prog.mk>