Index: etc/mtree/Makefile
===================================================================
RCS file: /cvsroot/src/etc/mtree/Makefile,v
retrieving revision 1.36.6.1
diff -p -u -r1.36.6.1 Makefile
--- etc/mtree/Makefile	30 Aug 2017 15:45:04 -0000	1.36.6.1
+++ etc/mtree/Makefile	23 Apr 2019 06:46:30 -0000
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.36.6.1 2017/08/30 15:45:04 martin Exp $
+#	$NetBSD: Makefile,v 1.38 2019/02/09 02:04:19 mrg Exp $
 
 .include <bsd.own.mk>
 
@@ -40,6 +40,10 @@ EXTRA_DIST_FILES+=	NetBSD.dist.dtrace
 EXTRA_DIST_FILES+=	NetBSD.dist.extsrc
 .endif
 
+.if ${MKISCSI} != "no"
+EXTRA_DIST_FILES+=	NetBSD.dist.iscsi
+.endif
+
 NetBSD.dist:	NetBSD.dist.tmp
 	cmp -s NetBSD.dist.tmp NetBSD.dist || { \
 		echo "Updating NetBSD.dist"; \
Index: etc/mtree/NetBSD.dist.base
===================================================================
RCS file: /cvsroot/src/etc/mtree/NetBSD.dist.base,v
retrieving revision 1.160.2.3
diff -p -u -r1.160.2.3 NetBSD.dist.base
--- etc/mtree/NetBSD.dist.base	31 Oct 2018 08:55:32 -0000	1.160.2.3
+++ etc/mtree/NetBSD.dist.base	23 Apr 2019 06:46:30 -0000
@@ -112,10 +112,14 @@
 ./usr/include/dev
 ./usr/include/dev/apm
 ./usr/include/dev/ata
+./usr/include/dev/bluetooth
 ./usr/include/dev/dec
+./usr/include/dev/dm
 ./usr/include/dev/dmover
 ./usr/include/dev/dtv
 ./usr/include/dev/filemon
+./usr/include/dev/hdaudio
+./usr/include/dev/hdmicec
 ./usr/include/dev/hpc
 ./usr/include/dev/i2c
 ./usr/include/dev/i2o
@@ -127,6 +131,8 @@
 ./usr/include/dev/pci
 ./usr/include/dev/pckbc
 ./usr/include/dev/pcmcia
+./usr/include/dev/pud
+./usr/include/dev/putter
 ./usr/include/dev/raidframe
 ./usr/include/dev/sbus
 ./usr/include/dev/scsipi
@@ -208,15 +214,16 @@
 ./usr/include/msdosfs
 ./usr/include/net
 ./usr/include/net/agr
+./usr/include/net80211
 ./usr/include/netatalk
 ./usr/include/netbt
 ./usr/include/netcan
 ./usr/include/netinet
-./usr/include/net80211
 ./usr/include/netinet6
 ./usr/include/netipsec
 ./usr/include/netisdn
 ./usr/include/netkey
+./usr/include/netmpls
 ./usr/include/netnatm
 ./usr/include/netpgp
 ./usr/include/netsmb
Index: etc/mtree/NetBSD.dist.iscsi
===================================================================
RCS file: etc/mtree/NetBSD.dist.iscsi
diff -N etc/mtree/NetBSD.dist.iscsi
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ etc/mtree/NetBSD.dist.iscsi	23 Apr 2019 06:46:30 -0000
@@ -0,0 +1,3 @@
+#	$NetBSD: NetBSD.dist.iscsi,v 1.1 2019/02/09 02:04:19 mrg Exp $
+
+./usr/include/dev/iscsi