diff --git a/distrib/sets/lists/base/mi b/distrib/sets/lists/base/mi
index 611825151fec..973d93021a5d 100644
--- a/distrib/sets/lists/base/mi
+++ b/distrib/sets/lists/base/mi
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1114 2015/09/03 22:24:02 youri Exp $
+# $NetBSD: mi,v 1.1115 2015/10/09 19:23:18 riz Exp $
 #
 # Note:	Don't delete entries from here - mark them as "obsolete" instead,
 #	unless otherwise stated below.
@@ -1190,6 +1190,11 @@
 ./usr/include/uvm				base-c-usr
 ./usr/include/vm				base-obsolete		obsolete
 ./usr/lib					base-sys-usr		compatdir
+./usr/lib/dtrace				base-sys-usr		dtrace
+./usr/lib/dtrace/errno.d			base-sys-usr		dtrace
+./usr/lib/dtrace/psinfo.d			base-sys-usr		dtrace
+./usr/lib/dtrace/signal.d			base-sys-usr		dtrace
+./usr/lib/dtrace/unistd.d			base-sys-usr		dtrace
 ./usr/lib/i18n					base-i18n-root		compatfile
 ./usr/lib/libntp.so				base-obsolete		obsolete
 ./usr/lib/libssp.so				base-obsolete		obsolete
diff --git a/etc/mtree/Makefile b/etc/mtree/Makefile
index 5a4b8ea94d3a..ad9cf339cc95 100644
--- a/etc/mtree/Makefile
+++ b/etc/mtree/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.29 2015/07/23 08:03:25 mrg Exp $
+#	$NetBSD: Makefile,v 1.30 2015/10/09 19:23:18 riz Exp $
 
 .include <bsd.own.mk>
 
@@ -28,6 +28,10 @@ EXTRA_DIST_FILES+=	NetBSD.dist.tests.compat
 .endif
 .endif
 
+.if ${MKDTRACE} != "no"
+EXTRA_DIST_FILES+=	${.CURDIR}/NetBSD.dist.dtrace
+.endif
+
 .if ${MKEXTSRC} != "no"
 EXTRA_DIST_FILES+=	${.CURDIR}/NetBSD.dist.extsrc
 .endif
diff --git a/etc/mtree/NetBSD.dist.dtrace b/etc/mtree/NetBSD.dist.dtrace
new file mode 100644
index 000000000000..4f72da3e9ec9
--- /dev/null
+++ b/etc/mtree/NetBSD.dist.dtrace
@@ -0,0 +1,3 @@
+#	$NetBSD: NetBSD.dist.dtrace,v 1.1 2015/10/09 19:23:18 riz Exp $
+
+./usr/lib/dtrace