Index: head/etc/mtree/BSD.include.dist
===================================================================
--- head/etc/mtree/BSD.include.dist	(revision 169715)
+++ head/etc/mtree/BSD.include.dist	(revision 169716)
@@ -1,244 +1,298 @@
 # $FreeBSD$
 #
 # Please see the file src/etc/mtree/README before making changes to this file.
 #
 
 /set type=dir uname=root gname=wheel mode=0755
 .
     altq
     ..
     arpa
     ..
     bsm
     ..
     bsnmp
     ..
     c++
-        3.4
-            backward
-            ..
+	4.2
+	    backward
+	    ..
             bits
             ..
             debug
             ..
             ext
+		pb_ds
+		    detail
+			pairing_heap_
+			..
+			splay_tree_
+			..
+			list_update_map_
+			..
+			basic_tree_policy
+			..
+			trie_policy
+			..
+			gp_hash_table_map_
+			..
+			tree_policy
+			..
+			binomial_heap_base_
+			..
+			resize_policy
+			..
+			bin_search_tree_
+			..
+			binomial_heap_
+			..
+			thin_heap_
+			..
+			pat_trie_
+			..
+			cc_hash_table_map_
+			..
+			rc_binomial_heap_
+			..
+			left_child_next_sibling_heap_
+			..
+			unordered_iterator
+			..
+			binary_heap_
+			..
+			ov_tree_map_
+			..
+			hash_fn
+			..
+			eq_fn
+			..
+			rb_tree_map_
+			..
+			list_update_policy
+			..
+		    ..
+		..
             ..
+            tr1
+            ..
         ..
     ..
     cam
         scsi
         ..
     ..
     crypto
     ..
     dev
         acpica
         ..
         an
         ..
         bktr
         ..
         firewire
         ..
         hwpmc
         ..
         ic
         ..
         ieee488
         ..
         iicbus
         ..
         lmc
         ..
         ofw
         ..
         pbio
         ..
         ppbus
         ..
         powermac_nvram
         ..
         smbus
         ..
         speaker
         ..
         usb
         ..
         utopia
         ..
         vkbd
         ..
         wi
         ..
     ..
     fs
         devfs
         ..
         fdescfs
         ..
         fifofs
         ..
         msdosfs
         ..
         ntfs
         ..
         nullfs
         ..
         nwfs
         ..
         portalfs
         ..
         procfs
         ..
         smbfs
         ..
         udf
         ..
         umapfs
         ..
         unionfs
         ..
     ..
     geom
         cache
         ..
         concat
         ..
         eli
         ..
         gate
         ..
         journal
         ..
         label
         ..
         mirror
         ..
         multipath
         ..
         nop
         ..
         raid3
         ..
         shsec
         ..
         stripe
         ..
     ..
     gnu
         posix
         ..
     ..
     gpib
     ..
     gssapi
     ..
     isofs
         cd9660
         ..
     ..
     kadm5
     ..
     libmilter
     ..
     lwres
     ..
     machine
         pc
         ..
     ..
     net
     ..
     net80211
     ..
     netatalk
     ..
     netatm
         ipatm
         ..
         sigpvc
         ..
         spans
         ..
         uni
         ..
     ..
     netgraph
         atm
         ..
         bluetooth
             include
             ..
         ..
         netflow
         ..
     ..
     netinet
     ..
     netinet6
     ..
     netipsec
     ..
     netipx
     ..
     netkey
     ..
     netnatm
         api
         ..
         msg
         ..
         saal
         ..
         sig
         ..
     ..
     netncp
     ..
     netsmb
     ..
     nfs
     ..
     nfsclient
     ..
     nfsserver
     ..
     objc
     ..
     openssl
     ..
     pccard
     ..
     protocols
     ..
     readline
     ..
     rpc
     ..
     rpcsvc
     ..
     security
         audit
         ..
         mac_biba
         ..
         mac_bsdextended
         ..
         mac_lomac
         ..
         mac_mls
         ..
         mac_partition
         ..
+    ..
+    ssp
     ..
     sys
     ..
     ufs
         ffs
         ..
         ufs
         ..
     ..
     vm
     ..
 ..