diff --git a/etc/mtree/Makefile b/etc/mtree/Makefile
index 5e89348e421a..b927c529254b 100644
--- a/etc/mtree/Makefile
+++ b/etc/mtree/Makefile
@@ -1,9 +1,11 @@
-#	$NetBSD: Makefile,v 1.40 2019/02/17 05:29:08 mrg Exp $
+#	$NetBSD: Makefile,v 1.41 2019/03/12 10:07:49 mrg Exp $
 
 .include <bsd.own.mk>
 
+EXTRA_DIST_FILES=	NetBSD.dist.machine	# autogenerated
+
 .if ${MKX11} != "no"
-EXTRA_DIST_FILES=	NetBSD.dist.Xorg
+EXTRA_DIST_FILES+=	NetBSD.dist.Xorg
 .endif
 
 # Derived from MACHINE_CPU, but keeping 32/64bit for most.
@@ -77,6 +79,10 @@ NetBSD.dist:	NetBSD.dist.tmp
 NetBSD.dist.tmp: NetBSD.dist.base ${EXTRA_DIST_FILES}
 	${TOOL_CAT} ${.ALLSRC} > ${.TARGET}
 
+NetBSD.dist.machine:
+	${MKCREATE}
+	echo ./usr/include/${MACHINE} > ${.TARGET}
+
 NetBSD.dist.compat: NetBSD.dist.compat.in mkcompat.awk
 	${MKCREATE}
 	${TOOL_AWK} -f ${.ALLSRC:M*.awk} -v COMPATDIRS=${ARCHDIR_SUBDIR:T:Q} \
@@ -130,6 +136,7 @@ distrib-dirs: .PHONY check_DESTDIR NetBSD.dist
 .endif	# DISTRIBUTION_DONE						# }
 
 CLEANFILES+=	NetBSD.dist NetBSD.dist.tmp
+CLEANFILES+=	NetBSD.dist.machine
 CLEANFILES+=	NetBSD.dist.compat
 CLEANFILES+=	NetBSD.dist.tests.compat
 
diff --git a/etc/mtree/NetBSD.dist.aarch64 b/etc/mtree/NetBSD.dist.aarch64
deleted file mode 100644
index ffcd4d4bdb82..000000000000
--- a/etc/mtree/NetBSD.dist.aarch64
+++ /dev/null
@@ -1,3 +0,0 @@
-#	$NetBSD: NetBSD.dist.aarch64,v 1.6 2019/02/17 05:29:08 mrg Exp $
-
-./usr/include/aarch64
diff --git a/etc/mtree/NetBSD.dist.i386 b/etc/mtree/NetBSD.dist.i386
index 9695dd06d903..6982d818ed12 100644
--- a/etc/mtree/NetBSD.dist.i386
+++ b/etc/mtree/NetBSD.dist.i386
@@ -1,5 +1,4 @@
-#	$NetBSD: NetBSD.dist.i386,v 1.1 2019/02/09 00:15:28 mrg Exp $
+#	$NetBSD: NetBSD.dist.i386,v 1.2 2019/03/12 10:07:49 mrg Exp $
 
-./usr/include/i386
 ./usr/include/x86
 ./usr/include/xen
diff --git a/etc/mtree/NetBSD.dist.ia64 b/etc/mtree/NetBSD.dist.ia64
deleted file mode 100644
index fad2f316a239..000000000000
--- a/etc/mtree/NetBSD.dist.ia64
+++ /dev/null
@@ -1,3 +0,0 @@
-#	$NetBSD: NetBSD.dist.ia64,v 1.1 2019/02/17 05:29:08 mrg Exp $
-
-./usr/include/ia64
diff --git a/etc/mtree/NetBSD.dist.ofppc b/etc/mtree/NetBSD.dist.ofppc
deleted file mode 100644
index 70ca7364c444..000000000000
--- a/etc/mtree/NetBSD.dist.ofppc
+++ /dev/null
@@ -1,3 +0,0 @@
-#	$NetBSD: NetBSD.dist.ofppc,v 1.1 2019/03/01 04:39:37 mrg Exp $
-
-./usr/include/ofppc
diff --git a/etc/mtree/NetBSD.dist.powerpc b/etc/mtree/NetBSD.dist.powerpc
index f2d2bbcc7368..8a141a91d005 100644
--- a/etc/mtree/NetBSD.dist.powerpc
+++ b/etc/mtree/NetBSD.dist.powerpc
@@ -1,3 +1,5 @@
-#	$NetBSD: NetBSD.dist.powerpc,v 1.1 2019/02/17 05:29:08 mrg Exp $
+#	$NetBSD: NetBSD.dist.powerpc,v 1.2 2019/03/12 10:07:49 mrg Exp $
 
 ./usr/include/powerpc
+./usr/include/powerpc/oea
+./usr/include/powerpc/ibm4xx
diff --git a/etc/mtree/NetBSD.dist.sparc b/etc/mtree/NetBSD.dist.sparc
index e48f48b182a0..d2735ceeb395 100644
--- a/etc/mtree/NetBSD.dist.sparc
+++ b/etc/mtree/NetBSD.dist.sparc
@@ -1,4 +1,3 @@
-#	$NetBSD: NetBSD.dist.sparc,v 1.1 2019/02/17 05:29:08 mrg Exp $
+#	$NetBSD: NetBSD.dist.sparc,v 1.2 2019/03/12 10:07:49 mrg Exp $
 
-./usr/include/sparc
 ./usr/include/sparc64
diff --git a/etc/mtree/NetBSD.dist.sparc64 b/etc/mtree/NetBSD.dist.sparc64
index 9de6bd6a24cc..8e22f66f580d 100644
--- a/etc/mtree/NetBSD.dist.sparc64
+++ b/etc/mtree/NetBSD.dist.sparc64
@@ -1,4 +1,3 @@
-#	$NetBSD: NetBSD.dist.sparc64,v 1.12 2019/02/17 05:29:08 mrg Exp $
+#	$NetBSD: NetBSD.dist.sparc64,v 1.13 2019/03/12 10:07:49 mrg Exp $
 
-./usr/include/sparc
 ./usr/include/sparc64
diff --git a/etc/mtree/NetBSD.dist.sun2 b/etc/mtree/NetBSD.dist.sun2
new file mode 100644
index 000000000000..eac30c4ce0d7
--- /dev/null
+++ b/etc/mtree/NetBSD.dist.sun2
@@ -0,0 +1,3 @@
+#	$NetBSD: NetBSD.dist.sun2,v 1.1 2019/03/12 10:07:49 mrg Exp $
+
+./usr/include/sun68k
diff --git a/etc/mtree/NetBSD.dist.sun3 b/etc/mtree/NetBSD.dist.sun3
new file mode 100644
index 000000000000..2ac495db0e52
--- /dev/null
+++ b/etc/mtree/NetBSD.dist.sun3
@@ -0,0 +1,3 @@
+#	$NetBSD: NetBSD.dist.sun3,v 1.1 2019/03/12 10:07:49 mrg Exp $
+
+./usr/include/sun68k
diff --git a/etc/mtree/NetBSD.dist.x86_64 b/etc/mtree/NetBSD.dist.x86_64
index bcaa5b1ff7f8..7a37b30e21f4 100644
--- a/etc/mtree/NetBSD.dist.x86_64
+++ b/etc/mtree/NetBSD.dist.x86_64
@@ -1,6 +1,5 @@
-#	$NetBSD: NetBSD.dist.x86_64,v 1.13 2019/02/09 21:43:23 mrg Exp $
+#	$NetBSD: NetBSD.dist.x86_64,v 1.14 2019/03/12 10:07:49 mrg Exp $
 
-./usr/include/amd64
 ./usr/include/dev/nvmm
 ./usr/include/dev/nvmm/x86
 ./usr/include/i386