diff --git a/src/etc/mtree/special b/src/etc/mtree/special
index 69b7def9..81f91275 100644
--- a/src/etc/mtree/special
+++ b/src/etc/mtree/special
@@ -1,4 +1,4 @@
-#	$OpenBSD: special,v 1.5 1996/12/06 16:47:15 millert Exp $
+#	$OpenBSD: special,v 1.6 1996/12/14 18:52:23 millert Exp $
 #	$NetBSD: special,v 1.4 1996/05/08 21:30:18 pk Exp $
 #	@(#)special	8.2 (Berkeley) 1/23/94
 #
@@ -9,16 +9,16 @@
 
 dev		type=dir mode=0755 uname=root gname=wheel
 drum		type=char mode=640 uname=root gname=kmem
-fd		type=dir mode=0755 uname=root gname=wheel ignore
+fd		type=dir mode=0555 uname=root gname=wheel ignore
 ..	#dev/fd
 kmem		type=char mode=640 uname=root gname=kmem
-mem		type=char mode=640 uname=root gname=kmem ignore
+mem		type=char mode=640 uname=root gname=kmem
 ..	#dev
 
 etc		type=dir mode=0755 uname=root gname=wheel
 aliases		type=file mode=0644 uname=root gname=wheel
 aliases.db	type=file mode=0644 uname=root gname=wheel
-crontab		type=file mode=0644 uname=root gname=wheel
+crontab		type=file mode=0644 uname=root gname=wheel optional
 csh.cshrc	type=file mode=0644 uname=root gname=wheel
 csh.login	type=file mode=0644 uname=root gname=wheel
 csh.logout	type=file mode=0644 uname=root gname=wheel
@@ -26,11 +26,15 @@ daily		type=file mode=0644 uname=root gname=wheel
 disklabels	type=dir mode=0755 uname=root gname=wheel ignore
 ..	#disklabels
 exports		type=file mode=0644 uname=root gname=wheel
+fbtab		type=file mode=0644 uname=root gname=wheel
 fstab		type=file mode=0644 uname=root gname=wheel
 ftpusers	type=file mode=0644 uname=root gname=wheel
 group		type=file mode=0644 uname=root gname=wheel
-hosts.equiv	type=file mode=0600 uname=root gname=wheel
-kerberosIV	type=dir mode=0755 uname=root gname=wheel ignore
+hosts		type=file mode=0644 uname=root gname=wheel
+hosts.equiv	type=file mode=0600 uname=root gname=wheel optional
+inetd.conf	type=file mode=0644 uname=root gname=wheel
+ipf.rules	type=file mode=0644 uname=root gname=wheel optional
+kerberosIV	type=dir mode=0755 uname=root gname=wheel optional ignore
 ..	#kerberosIV
 mail.rc		type=file mode=0644 uname=root gname=wheel
 master.passwd	type=file mode=600 uname=root gname=wheel
@@ -45,12 +49,16 @@ printcap	type=file mode=0644 uname=root gname=wheel
 rc		type=file mode=0644 uname=root gname=wheel
 rc.local	type=file mode=0644 uname=root gname=wheel
 security	type=file mode=0644 uname=root gname=wheel
+resolv.conf	type=file mode=0644 uname=root gname=wheel optional
 sendmail.cf	type=file mode=0644 uname=root gname=wheel
 shells		type=file mode=0644 uname=root gname=wheel
+skeykeys	type=file mode=0644 uname=root gname=wheel
 spwd.db		type=file mode=0600 uname=root gname=wheel
 syslog.conf	type=file mode=0644 uname=root gname=wheel
 ttys		type=file mode=0644 uname=root gname=wheel
 weekly		type=file mode=0644 uname=root gname=wheel
+uucp		type=dir mode=0755 uname=root gname=wheel optional ignore
+..	#uucp
 ..	#etc
 
 root		type=dir mode=0755 uname=root gname=wheel
@@ -58,7 +66,7 @@ root		type=dir mode=0755 uname=root gname=wheel
 .klogin		type=file mode=0600 uname=root gname=wheel
 .login		type=file mode=0644 uname=root gname=wheel
 .profile	type=file mode=0644 uname=root gname=wheel
-.rhosts		type=file mode=0600 uname=root gname=wheel
+.rhosts		type=file mode=0600 uname=root gname=wheel optional
 ..	#root
 
 sbin		type=dir mode=0755 uname=root gname=wheel ignore
@@ -67,11 +75,11 @@ sbin		type=dir mode=0755 uname=root gname=wheel ignore
 usr		type=dir mode=0755 uname=root gname=wheel
 bin		type=dir mode=0755 uname=root gname=wheel ignore
 ..	#usr/bin
-games		type=dir mode=0755 uname=root gname=wheel
-hide		type=dir mode=0700 uname=games gname=wheel ignore
+games		type=dir mode=0755 uname=root gname=wheel optional
+hide		type=dir mode=0700 uname=games gname=games optional ignore
 ..	#usr/games/hide
 ..	#usr/games
-include		type=dir mode=0755 uname=root gname=wheel ignore
+include		type=dir mode=0755 uname=root gname=bin ignore
 ..	#usr/include
 lib		type=dir mode=0755 uname=root gname=wheel ignore
 ..	#usr/lib
@@ -95,12 +103,12 @@ src		type=dir mode=0775 uname=root gname=wsrc ignore
 
 var		type=dir mode=0755 uname=root gname=wheel
 account		type=dir mode=0755 uname=root gname=wheel
-acct		type=file mode=644 uname=root gname=wheel
+acct		type=file mode=644 uname=root gname=wheel optional
 ..	#var/account
 at		type=dir mode=0755 uname=root gname=daemon ignore
 ..	#var/at
-yp.no		type=dir mode=0755 uname=root gname=wheel ignore
-..	#var/yp.no
+yp		type=dir mode=0755 uname=root gname=wheel optional ignore
+..	#var/yp
 backups		type=dir mode=0755 uname=root gname=wheel ignore
 ..	#var/backups
 db		type=dir mode=0755 uname=root gname=wheel
@@ -118,19 +126,19 @@ run		type=dir mode=0755 uname=root gname=wheel
 utmp		type=file mode=0664 uname=root gname=utmp
 ..	#var/run
 spool		type=dir mode=0755 uname=root gname=wheel
-ftp		type=dir mode=0755 uname=root gname=wheel
-bin		type=dir mode=0755 uname=root gname=wheel
-ls		type=file mode=555 uname=root gname=wheel
+ftp		type=dir mode=0755 uname=root gname=wheel optional
+bin		type=dir mode=0755 uname=root gname=wheel optional
+ls		type=file mode=555 uname=root gname=wheel optional
 ..	#var/spool/ftp/bin
-etc		type=dir mode=0755 uname=root gname=wheel
-group		type=file mode=644 uname=root gname=wheel
-localtime	type=file mode=644 uname=root gname=wheel
-master.passwd	type=file mode=600 uname=root gname=wheel
-passwd		type=file mode=644 uname=root gname=wheel
+etc		type=dir mode=0755 uname=root gname=wheel optional
+group		type=file mode=644 uname=root gname=wheel optional
+localtime	type=file mode=644 uname=root gname=wheel optional
+master.passwd	type=file mode=600 uname=root gname=wheel optional
+passwd		type=file mode=644 uname=root gname=wheel optional
 ..	#var/spool/ftp/etc
-hidden		type=dir mode=0111 uname=root gname=wheel ignore
+hidden		type=dir mode=0111 uname=root gname=wheel optional ignore
 ..	#var/spool/ftp/hidden
-pub		type=dir mode=0777 uname=root gname=wheel ignore
+pub		type=dir mode=0777 uname=root gname=wheel optional ignore
 ..	#var/spool/ftp/pub
 ..	#var/spool/ftp
 mqueue		type=dir mode=0755 uname=root gname=wheel ignore
@@ -143,6 +151,6 @@ secretmail	type=dir mode=0755 uname=root gname=wheel ignore
 ..	#var/spool/secretmail
 uucp		type=dir mode=0755 uname=uucp gname=daemon ignore
 ..	#var/spool/uucp
-uucppublic	type=dir mode=0777 uname=uucp gname=daemon ignore
+uucppublic	type=dir mode=01775 uname=uucp gname=daemon ignore
 ..	#var/spool/uucppublic
 ..	#var/spool