Index: etc/mtree/BSD.include.dist
===================================================================
--- etc/mtree/BSD.include.dist	(revision 284871)
+++ etc/mtree/BSD.include.dist	(working copy)
@@ -9,10 +9,6 @@
     ..
     arpa
     ..
-    atf-c
-    ..
-    atf-c++
-    ..
     bsm
     ..
     bsnmp
Index: etc/mtree/BSD.usr.dist
===================================================================
--- etc/mtree/BSD.usr.dist	(revision 284871)
+++ etc/mtree/BSD.usr.dist	(working copy)
@@ -126,8 +126,6 @@
     sbin
     ..
     share
-        atf
-        ..
         bsdconfig
             media
             ..
@@ -171,8 +169,6 @@
         doc
             IPv6
             ..
-            atf
-            ..
             atm
             ..
             legal