diff --git a/src/etc/Makefile b/src/etc/Makefile
index 4c7b1704..765c3a5e 100644
--- a/src/etc/Makefile
+++ b/src/etc/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.280 2009/09/24 21:45:58 miod Exp $
+#	$OpenBSD: Makefile,v 1.281 2009/10/01 19:01:28 matthieu Exp $
 
 TZDIR=		/usr/share/zoneinfo
 LOCALTIME=	Canada/Mountain
@@ -134,6 +134,8 @@ distribution-etc-root-var: distrib-dirs
 		${INSTALL} -c -o root -g wheel -m 444 4.4BSD.dist \
 		    ${DESTDIR}/etc/mtree; \
 		${INSTALL} -c -o root -g wheel -m 444 BSD.local.dist \
+		    ${DESTDIR}/etc/mtree; \
+		${INSTALL} -c -o root -g wheel -m 444 BSD.x11.dist \
 		    ${DESTDIR}/etc/mtree
 	cd ppp; \
 		${INSTALL} -c -o root -g wheel -m 600 chap-secrets \
diff --git a/src/etc/changelist b/src/etc/changelist
index 23f17f1c..c49346d0 100644
--- a/src/etc/changelist
+++ b/src/etc/changelist
@@ -1,4 +1,4 @@
-#	$OpenBSD: changelist,v 1.61 2009/09/23 20:33:23 matthieu Exp $
+#	$OpenBSD: changelist,v 1.62 2009/10/01 19:01:28 matthieu Exp $
 #
 # List of files which the security script backs up and checks
 # for modifications.
@@ -81,6 +81,7 @@
 /etc/mrouted.conf
 /etc/mtree/4.4BSD.dist
 /etc/mtree/BSD.local.dist
+/etc/mtree/BSD.x11.dist
 /etc/mtree/special
 /etc/mygate
 /etc/myname
diff --git a/src/etc/mtree/BSD.x11.dist b/src/etc/mtree/BSD.x11.dist
new file mode 100644
index 00000000..95c8fc1c
--- /dev/null
+++ b/src/etc/mtree/BSD.x11.dist
@@ -0,0 +1,401 @@
+#	$OpenBSD: BSD.x11.dist,v 1.6 2009/10/01 19:01:28 matthieu Exp $
+
+/set type=dir uname=root gname=wheel mode=0755
+.
+    etc
+        X11
+            app-defaults
+            ..
+            fs
+            ..
+            twm
+            ..
+            xdm
+                pixmaps
+                ..
+            ..
+            xinit
+            ..
+            xkb
+                compat
+                ..
+                geometry
+                    digital
+                    ..
+                    ibm
+                    ..
+                    sgi
+                    ..
+                ..
+                keycodes
+                    digital
+                    ..
+                    sgi
+                    ..
+                ..
+                keymap
+                    digital
+                    ..
+                    sgi
+                    ..
+                    sun
+                    ..
+                ..
+                rules
+                ..
+                semantics
+                ..
+                symbols
+                    digital
+                    ..
+                    fujitsu
+                    ..
+                    hp
+                    ..
+                    macintosh
+                    ..
+                    nec
+                    ..
+                    pc
+                    ..
+                    sgi
+                    ..
+                    sony
+                    ..
+                    sun
+                    ..
+                    xfree68
+                    ..
+                ..
+                torture
+                ..
+                types
+                ..
+            ..
+            xsm
+            ..
+        ..
+        fonts
+            conf.avail
+            ..
+            conf.d
+            ..
+        ..
+    ..
+    usr
+        X11R6
+            bin
+            ..
+            include
+                GL
+                    internal
+                    ..
+                ..
+                X11
+                    ICE
+                    ..
+                    PM
+                    ..
+                    SM
+                    ..
+                    Xaw
+                    ..
+                    Xcursor
+                    ..
+                    Xft
+                    ..
+                    Xmu
+                    ..
+                    XprintAppUtil
+                    ..
+                    XprintUtil
+                    ..
+                    Xtrans
+                    ..
+                    bitmaps
+                    ..
+                    dri
+                    ..
+                    extensions
+                    ..
+                    fonts
+                    ..
+                    pixmaps
+                    ..
+                ..
+                fontconfig
+                ..
+                freetype2
+                    freetype
+                        config
+                        ..
+                        internal
+                            services
+                            ..
+                        ..
+                    ..
+                ..
+                pixman-1
+                ..
+		xcb
+		..
+                xorg
+                ..
+            ..
+            lib
+                X11
+                    app-defaults
+                    ..
+                    config
+                    ..
+                    fonts
+                        100dpi
+                        ..
+                        75dpi
+                        ..
+                        OTF
+                        ..
+                        Speedo
+                        ..
+                        TTF
+                        ..
+                        Type1
+                        ..
+                        cyrillic
+                        ..
+                        encodings
+                            large
+                            ..
+                        ..
+                        misc
+                        ..
+                        util
+                        ..
+                    ..
+                    fvwm
+                    ..
+                    proxymngr
+                    ..
+                    x11perfcomp
+                    ..
+                    xedit
+                        lisp
+                            progmodes
+                            ..
+                        ..
+                    ..
+                ..
+                modules
+                    dri
+                    ..
+                    drivers
+                    ..
+                    extensions
+                    ..
+                    fonts
+                    ..
+                    input
+                    ..
+                    linux
+                    ..
+                    multimedia
+                    ..
+                ..
+                pkgconfig
+                ..
+                xorg
+                ..
+            ..
+            man
+                cat1
+                ..
+                cat3
+                ..
+                cat4
+                ..
+                cat5
+                ..
+                cat7
+                ..
+                man1
+                ..
+                man3
+                ..
+                man4
+                ..
+                man5
+                ..
+                man7
+                ..
+            ..
+            share
+                X11
+                    doc
+                    ..
+                    locale
+                        C
+                        ..
+                        am_ET.UTF-8
+                        ..
+                        armscii-8
+                        ..
+                        el_GR.UTF-8
+                        ..
+                        en_US.UTF-8
+                        ..
+			fi_FI.UTF-8
+			..
+                        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.S90
+                        ..
+                        ja.SJIS
+                        ..
+                        ja.U90
+                        ..
+                        ja_JP.UTF-8
+                        ..
+                        ko
+                        ..
+                        ko_KR.UTF-8
+                        ..
+                        koi8-c
+                        ..
+                        koi8-r
+                        ..
+                        koi8-u
+                        ..
+                        microsoft-cp1251
+                        ..
+                        microsoft-cp1255
+                        ..
+                        microsoft-cp1256
+                        ..
+                        mulelao-1
+                        ..
+                        nokhchi-1
+                        ..
+                        pt_BR.UTF-8
+                        ..
+			ru_RU.UTF-8
+			..
+                        tatar-cyr
+                        ..
+                        th_TH
+                        ..
+                        th_TH.UTF-8
+                        ..
+                        tscii-0
+                        ..
+                        vi_VN.tcvn
+                        ..
+                        vi_VN.viscii
+                        ..
+                        zh_CN
+                        ..
+                        zh_CN.UTF-8
+                        ..
+                        zh_CN.gb18030
+                        ..
+                        zh_CN.gbk
+                        ..
+                        zh_HK.UTF-8
+                        ..
+                        zh_HK.big5
+                        ..
+                        zh_HK.big5hkscs
+                        ..
+                        zh_TW
+                        ..
+                        zh_TW.UTF-8
+                        ..
+                        zh_TW.big5
+                        ..
+                    ..
+                ..
+                aclocal
+                ..
+                doc
+                    compositeproto
+                    ..
+                    damageproto
+                    ..
+		    dri2proto
+		    ..
+                    fontconfig
+                        fontconfig-devel
+                        ..
+                    ..
+                    randrproto
+                    ..
+                    renderproto
+                    ..
+                ..
+                mk
+                ..
+		xcb
+		..
+            ..
+        ..
+        local
+            lib
+                X11
+                ..
+            ..
+        ..
+    ..
+    var
+        cache
+            fontconfig
+            ..
+        ..
+        db
+            xkb
+            ..
+        ..
+        log
+        ..
+    ..
+..