diff --git a/distrib/sets/lists/xbase/md.amd64 b/distrib/sets/lists/xbase/md.amd64
index c018d4772..b94343a5c 100644
--- a/distrib/sets/lists/xbase/md.amd64
+++ b/distrib/sets/lists/xbase/md.amd64
@@ -30,7 +30,6 @@
 ./etc/X11/xkb/compat/pc98
 ./etc/X11/xkb/compat/xfree86
 ./etc/X11/xkb/compat/xtest
-./etc/X11/xkb/compiled
 ./etc/X11/xkb/geometry
 ./etc/X11/xkb/geometry.dir
 ./etc/X11/xkb/geometry/README
diff --git a/distrib/sets/lists/xbase/mi b/distrib/sets/lists/xbase/mi
index 5129d9e0f..3dcaa1b11 100644
--- a/distrib/sets/lists/xbase/mi
+++ b/distrib/sets/lists/xbase/mi
@@ -2,50 +2,7 @@
 ./etc/X11
 ./etc/X11/app-defaults
 ./etc/fonts
-./etc/fonts/conf.avail
-./etc/fonts/conf.avail/10-autohint.conf
-./etc/fonts/conf.avail/10-no-sub-pixel.conf
-./etc/fonts/conf.avail/10-sub-pixel-bgr.conf
-./etc/fonts/conf.avail/10-sub-pixel-rgb.conf
-./etc/fonts/conf.avail/10-sub-pixel-vbgr.conf
-./etc/fonts/conf.avail/10-sub-pixel-vrgb.conf
-./etc/fonts/conf.avail/10-unhinted.conf
-./etc/fonts/conf.avail/20-fix-globaladvance.conf
-./etc/fonts/conf.avail/20-lohit-gujarati.conf
-./etc/fonts/conf.avail/20-unhint-small-vera.conf
-./etc/fonts/conf.avail/30-amt-aliases.conf
-./etc/fonts/conf.avail/30-urw-aliases.conf
-./etc/fonts/conf.avail/40-generic.conf
-./etc/fonts/conf.avail/49-sansserif.conf
-./etc/fonts/conf.avail/50-user.conf
-./etc/fonts/conf.avail/51-local.conf
-./etc/fonts/conf.avail/60-latin.conf
-./etc/fonts/conf.avail/65-fonts-persian.conf
-./etc/fonts/conf.avail/65-nonlatin.conf
-./etc/fonts/conf.avail/69-unifont.conf
-./etc/fonts/conf.avail/70-no-bitmaps.conf
-./etc/fonts/conf.avail/70-yes-bitmaps.conf
-./etc/fonts/conf.avail/80-delicious.conf
-./etc/fonts/conf.avail/90-synthetic.conf
-./etc/fonts/conf.avail/README
 ./etc/fonts/conf.d
-./etc/fonts/conf.d/20-fix-globaladvance.conf
-./etc/fonts/conf.d/20-lohit-gujarati.conf
-./etc/fonts/conf.d/20-unhint-small-vera.conf
-./etc/fonts/conf.d/30-amt-aliases.conf
-./etc/fonts/conf.d/30-urw-aliases.conf
-./etc/fonts/conf.d/40-generic.conf
-./etc/fonts/conf.d/49-sansserif.conf
-./etc/fonts/conf.d/50-user.conf
-./etc/fonts/conf.d/51-local.conf
-./etc/fonts/conf.d/60-latin.conf
-./etc/fonts/conf.d/65-fonts-persian.conf
-./etc/fonts/conf.d/65-nonlatin.conf
-./etc/fonts/conf.d/69-unifont.conf
-./etc/fonts/conf.d/80-delicious.conf
-./etc/fonts/conf.d/90-synthetic.conf
-./etc/fonts/fonts.conf
-./etc/fonts/fonts.dtd
 ./usr
 ./usr/X11R6
 ./usr/X11R6/README
diff --git a/distrib/sets/lists/xetc/mi b/distrib/sets/lists/xetc/mi
index 30465d7f3..28662294a 100644
--- a/distrib/sets/lists/xetc/mi
+++ b/distrib/sets/lists/xetc/mi
@@ -67,3 +67,47 @@
 ./etc/X11/xdm/xdm-config
 ./etc/X11/xinit/xinitrc
 ./etc/X11/xsm/system.xsm
+./etc/fonts/conf.avail
+./etc/fonts/conf.avail/10-autohint.conf
+./etc/fonts/conf.avail/10-no-sub-pixel.conf
+./etc/fonts/conf.avail/10-sub-pixel-bgr.conf
+./etc/fonts/conf.avail/10-sub-pixel-rgb.conf
+./etc/fonts/conf.avail/10-sub-pixel-vbgr.conf
+./etc/fonts/conf.avail/10-sub-pixel-vrgb.conf
+./etc/fonts/conf.avail/10-unhinted.conf
+./etc/fonts/conf.avail/20-fix-globaladvance.conf
+./etc/fonts/conf.avail/20-lohit-gujarati.conf
+./etc/fonts/conf.avail/20-unhint-small-vera.conf
+./etc/fonts/conf.avail/30-amt-aliases.conf
+./etc/fonts/conf.avail/30-urw-aliases.conf
+./etc/fonts/conf.avail/40-generic.conf
+./etc/fonts/conf.avail/49-sansserif.conf
+./etc/fonts/conf.avail/50-user.conf
+./etc/fonts/conf.avail/51-local.conf
+./etc/fonts/conf.avail/60-latin.conf
+./etc/fonts/conf.avail/65-fonts-persian.conf
+./etc/fonts/conf.avail/65-nonlatin.conf
+./etc/fonts/conf.avail/69-unifont.conf
+./etc/fonts/conf.avail/70-no-bitmaps.conf
+./etc/fonts/conf.avail/70-yes-bitmaps.conf
+./etc/fonts/conf.avail/80-delicious.conf
+./etc/fonts/conf.avail/90-synthetic.conf
+./etc/fonts/conf.avail/README
+./etc/fonts/conf.d/10-autohint.conf
+./etc/fonts/conf.d/20-fix-globaladvance.conf
+./etc/fonts/conf.d/20-lohit-gujarati.conf
+./etc/fonts/conf.d/20-unhint-small-vera.conf
+./etc/fonts/conf.d/30-amt-aliases.conf
+./etc/fonts/conf.d/30-urw-aliases.conf
+./etc/fonts/conf.d/40-generic.conf
+./etc/fonts/conf.d/49-sansserif.conf
+./etc/fonts/conf.d/50-user.conf
+./etc/fonts/conf.d/51-local.conf
+./etc/fonts/conf.d/60-latin.conf
+./etc/fonts/conf.d/65-fonts-persian.conf
+./etc/fonts/conf.d/65-nonlatin.conf
+./etc/fonts/conf.d/69-unifont.conf
+./etc/fonts/conf.d/80-delicious.conf
+./etc/fonts/conf.d/90-synthetic.conf
+./etc/fonts/fonts.conf
+./etc/fonts/fonts.dtd
diff --git a/distrib/sets/lists/xserv/md.amd64 b/distrib/sets/lists/xserv/md.amd64
index 5cd643c9c..8cc2264bb 100644
--- a/distrib/sets/lists/xserv/md.amd64
+++ b/distrib/sets/lists/xserv/md.amd64
@@ -1328,4 +1328,7 @@
 ./usr/X11R6/share/X11/xserver/zh_TW.big5
 ./usr/X11R6/share/X11/xserver/zh_TW.euctw
 ./usr/X11R6/share/X11/xserver/zh_TW.utf8
+./var/db
+./var/db/xkb
+./var/db/xkb/README.compiled
 ./var/log
diff --git a/distrib/sets/lists/xshare/mi b/distrib/sets/lists/xshare/mi
index a8fef51a5..f37471300 100644
--- a/distrib/sets/lists/xshare/mi
+++ b/distrib/sets/lists/xshare/mi
@@ -2370,9 +2370,6 @@
 ./usr/X11R6/share/X11/locale/zh_TW/XI18N_OBJS
 ./usr/X11R6/share/X11/locale/zh_TW/XLC_LOCALE
 ./usr/X11R6/share/X11/rgb.txt
-./usr/X11R6/share/X11/xkb
-./usr/X11R6/share/X11/xkb/compiled
-./usr/X11R6/share/X11/xkb/compiled/README.compiled
 ./usr/X11R6/share/aclocal
 ./usr/X11R6/share/aclocal/fontutil.m4
 ./usr/X11R6/share/aclocal/xaw.m4