diff --git a/etc/mtree/BSD.include.dist b/etc/mtree/BSD.include.dist
index a0e5806657b9..95e12c1c4f01 100644
--- a/etc/mtree/BSD.include.dist
+++ b/etc/mtree/BSD.include.dist
@@ -22,6 +22,8 @@
         ..
     ..
     fs
+        devfs
+        ..
         fdescfs
         ..
         fifofs
diff --git a/include/Makefile b/include/Makefile
index 01dfc0026611..0db783f0d733 100644
--- a/include/Makefile
+++ b/include/Makefile
@@ -45,7 +45,7 @@ LDIRS=	cam net netatalk netatm netgraph netinet netinet6 \
 
 LNOHEADERDIRS=	fs isofs ufs dev
 
-LSUBDIRS=	cam/scsi dev/ic dev/ppbus dev/usb dev/wi \
+LSUBDIRS=	cam/scsi dev/ic dev/ppbus dev/usb dev/wi fs/devfs \
 	fs/fdescfs fs/fifofs fs/msdosfs fs/ntfs fs/nullfs fs/nwfs fs/portalfs \
 	fs/procfs fs/smbfs fs/umapfs fs/unionfs isofs/cd9660 \
 	ufs/ffs ufs/ufs