diff --git a/src/etc/Makefile b/src/etc/Makefile
index 72bd6685..2e9edf67 100644
--- a/src/etc/Makefile
+++ b/src/etc/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.278 2009/05/24 10:45:21 ajacoutot Exp $
+#	$OpenBSD: Makefile,v 1.279 2009/09/23 20:33:23 matthieu Exp $
 
 TZDIR=		/usr/share/zoneinfo
 LOCALTIME=	Canada/Mountain
@@ -134,8 +134,6 @@ 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 ae72b2ca..23f17f1c 100644
--- a/src/etc/changelist
+++ b/src/etc/changelist
@@ -1,4 +1,4 @@
-#	$OpenBSD: changelist,v 1.60 2009/03/16 23:18:45 jacekm Exp $
+#	$OpenBSD: changelist,v 1.61 2009/09/23 20:33:23 matthieu Exp $
 #
 # List of files which the security script backs up and checks
 # for modifications.
@@ -81,7 +81,6 @@
 /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
deleted file mode 100644
index c1cf50a3..00000000
--- a/src/etc/mtree/BSD.x11.dist
+++ /dev/null
@@ -1,283 +0,0 @@
-#     $OpenBSD: BSD.x11.dist,v 1.4 2002/06/09 06:15:15 todd Exp $
-#     $FreeBSD: BSD.x11.dist,v 1.2 1997/06/10 07:55:10 asami Exp $
-#
-
-/set type=dir uname=root gname=wheel mode=0755
-.
-    bin
-    ..
-    include
-        X11
-            ICE
-            ..
-            PEX5
-            ..
-            PM
-            ..
-            SM
-            ..
-            Xaw
-            ..
-            Xmu
-            ..
-            bitmaps
-            ..
-            extensions
-            ..
-            fonts
-            ..
-            pixmaps
-            ..
-        ..
-    ..
-    info
-    ..
-    lib
-        X11
-            XF86Setup
-                pics
-                ..
-                scripts
-                ..
-                tcllib
-                ..
-            ..
-            app-defaults
-            ..
-            config
-            ..
-            doc
-            ..
-            etc
-            ..
-            fonts
-                100dpi
-                ..
-                75dpi
-                ..
-                PEX
-                ..
-                Speedo
-                ..
-                Type1
-                ..
-                cyrillic
-                ..
-                misc
-                ..
-            ..
-            fs
-            ..
-            lbxproxy
-            ..
-            locale
-                C
-                ..
-                en_US.utf
-                ..
-                iso8859-1
-                ..
-                iso8859-2
-                ..
-                iso8859-3
-                ..
-                iso8859-4
-                ..
-                iso8859-5
-                ..
-                iso8859-6
-                ..
-                iso8859-7
-                ..
-                iso8859-8
-                ..
-                iso8859-9
-                ..
-                ja
-                ..
-                ja.JIS
-                ..
-                ja.SJIS
-                ..
-                ko
-                ..
-                koi8-r
-                ..
-                tbl_data
-                ..
-                th_TH.TACTIS
-                ..
-                zh
-                ..
-                zh_TW
-                ..
-            ..
-            proxymngr
-            ..
-            rstart
-                commands
-                    x11r6
-                    ..
-                ..
-                contexts
-                ..
-            ..
-            twm
-            ..
-            x11perfcomp
-            ..
-            xdm
-            ..
-            xinit
-            ..
-            xkb
-                compat
-                ..
-                compiled
-                ..
-                geometry
-                    digital
-                    ..
-                    sgi
-                    ..
-                ..
-                keycodes
-                    digital
-                    ..
-                    sgi
-                    ..
-                ..
-                keymap
-                    digital
-                    ..
-                    sgi
-                    ..
-                    sun
-                    ..
-                ..
-                rules
-                ..
-                semantics
-                ..
-                symbols
-                    digital
-                    ..
-                    fujitsu
-                    ..
-                    nec
-                    ..
-                    sony
-                    ..
-                    sun
-                    ..
-                ..
-            ..
-            xserver
-            ..
-            xsm
-            ..
-        ..
-        modules
-        ..
-    ..
-    libexec
-    ..
-    man
-        cat1
-        ..
-        cat2
-        ..
-        cat3
-        ..
-        cat4
-        ..
-        cat5
-        ..
-        cat6
-        ..
-        cat7
-        ..
-        cat8
-        ..
-        cat9
-        ..
-        catl
-        ..
-        catn
-        ..
-        ja_JP.EUC
-            cat1
-            ..
-            cat2
-            ..
-            cat3
-            ..
-            cat4
-            ..
-            cat5
-            ..
-            cat6
-            ..
-            cat7
-            ..
-            cat8
-            ..
-            cat9
-            ..
-            catl
-            ..
-            catn
-            ..
-            man1
-            ..
-            man2
-            ..
-            man3
-            ..
-            man4
-            ..
-            man5
-            ..
-            man6
-            ..
-            man7
-            ..
-            man8
-            ..
-            man9
-            ..
-            manl
-            ..
-            mann
-            ..
-        ..
-        man1
-        ..
-        man2
-        ..
-        man3
-        ..
-        man4
-        ..
-        man5
-        ..
-        man6
-        ..
-        man7
-        ..
-        man8
-        ..
-        man9
-        ..
-        manl
-        ..
-        mann
-        ..
-    ..
-    share
-        doc
-        ..
-        examples
-        ..
-    ..
-..