diff --git a/etc/mtree/BSD.x11-4.dist b/etc/mtree/BSD.x11-4.dist
index e1a6033dda25..c324ee6c0448 100644
--- a/etc/mtree/BSD.x11-4.dist
+++ b/etc/mtree/BSD.x11-4.dist
@@ -12,338 +12,18 @@
         ..
     ..
     include
-        DPS
-        ..
-        GL
-        ..
         X11
-            ICE
-            ..
-            PEX5
-            ..
-            PM
-            ..
-            SM
-            ..
-            Xaw
-            ..
-            Xcursor
-            ..
-            Xft
-            ..
-            Xmu
-            ..
-            bitmaps
-            ..
-            extensions
-            ..
-            fonts
-                codeconv
-                ..
-            ..
-            pixmaps
-            ..
-        ..
-        bitmaps
-        ..
-        freetype2
-            freetype
-                cache
-                ..
-                config
-                ..
-                internal
-                ..
-            ..
         ..
     ..
     info
     ..
     lib
         X11
-            XF86Setup
-                pics
-                ..
-                scripts
-                ..
-                tcllib
-                ..
-            ..
             app-defaults
             ..
-            config
-            ..
-            doc
-                PostScript
-                ..
-                html
-                ..
-            ..
-            etc
-            ..
             fonts
-                100dpi
-                ..
-                75dpi
-                ..
-                CID
-                ..
-                PEX
-                ..
-                Speedo
-                ..
-                TTF
-                ..
-                Type1
-                ..
-                cyrillic
-                ..
-                encodings
-                    large
-                    ..
-                ..
-                latin2
-                    100dpi
-                    ..
-                    75dpi
-                    ..
-                ..
                 local
                 ..
-                misc
-                ..
-                util
-                ..
-            ..
-            fs
-            ..
-            icons
-            ..
-            lbxproxy
-            ..
-            locale
-                C
-                ..
-                armscii-8
-                ..
-                common
-                ..
-                el_GR.UTF-8
-                ..
-                en_US.UTF-8
-                ..
-                en_US.utf
-                ..
-                georgian-academy
-                ..
-                georgian-ps
-                ..
-                ibm-cp1133
-                ..
-                iscii-dev
-                ..
-                isiri-3342
-                ..
-                iso8859-1
-                ..
-                iso8859-10
-                ..
-                iso8859-11
-                ..
-                iso8859-13
-                ..
-                iso8859-14
-                ..
-                iso8859-15
-                ..
-                iso8859-2
-                ..
-                iso8859-3
-                ..
-                iso8859-4
-                ..
-                iso8859-5
-                ..
-                iso8859-6
-                ..
-                iso8859-7
-                ..
-                iso8859-8
-                ..
-                iso8859-9
-                ..
-                iso8859-9e
-                ..
-                ja
-                ..
-                ja.JIS
-                ..
-                ja.SJIS
-                ..
-                ja_JP.UTF-8
-                ..
-                ko
-                ..
-                ko_KR.UTF-8
-                ..
-                koi8-c
-                ..
-                koi8-r
-                ..
-                koi8-u
-                ..
-                lib
-                    common
-                    ..
-                ..
-                microsoft-cp1251
-                ..
-                microsoft-cp1255
-                ..
-                microsoft-cp1256
-                ..
-                mk_MK.UTF-8
-                ..
-                mulelao-1
-                ..
-                nokhchi-1
-                ..
-                tatar-cyr
-                ..
-                tbl_data
-                ..
-                th_TH
-                ..
-                th_TH.TACTIS
-                ..
-                th_TH.UTF-8
-                ..
-                tscii-0
-                ..
-                vi_VN.tcvn
-                ..
-                vi_VN.viscii
-                ..
-                zh
-                ..
-                zh_CN
-                ..
-                zh_CN.gbk
-                ..
-                zh_HK.big5
-                ..
-                zh_HK.big5hkscs
-                ..
-                zh_TW
-                ..
-                zh_TW.Big5
-                ..
-                zh_TW.UTF-8
-                ..
-                zh_TW.big5
-                ..
-            ..
-            proxymngr
-            ..
-            rstart
-                commands
-                    x11r6
-                    ..
-                ..
-                contexts
-                ..
-            ..
-            twm
-            ..
-            x11perfcomp
-            ..
-            xdm
-                pixmaps
-                ..
-            ..
-            xedit
-                lisp
-                    progmodes
-                    ..
-                ..
-            ..
-            xinit
-            ..
-            xkb
-                compat
-                ..
-                compiled
-                ..
-                geometry
-                    digital
-                    ..
-                    sgi
-                    ..
-                ..
-                keycodes
-                    digital
-                    ..
-                    sgi
-                    ..
-                ..
-                keymap
-                    digital
-                    ..
-                    sgi
-                    ..
-                    sun
-                    ..
-                ..
-                rules
-                ..
-                semantics
-                ..
-                symbols
-                    digital
-                    ..
-                    fujitsu
-                    ..
-                    hp
-                    ..
-                    macintosh
-                    ..
-                    nec
-                    ..
-                    pc
-                    ..
-                    sgi
-                    ..
-                    sony
-                    ..
-                    sun
-                    ..
-                    xfree68
-                    ..
-                ..
-                types
-                ..
-            ..
-            xserver
-            ..
-            xsm
-            ..
-        ..
-        aout
-        ..
-        modules
-            codeconv
-            ..
-            dri
-            ..
-            drivers
-            ..
-            extensions
-            ..
-            fonts
-            ..
-            freebsd
-            ..
-            input
             ..
         ..
     ..
@@ -798,5 +478,7 @@
                 ..
             ..
         ..
+	pixmaps
+	..
     ..
 ..