diff --git a/distrib/sets/lists/xbase/md.alpha b/distrib/sets/lists/xbase/md.alpha
index 70f6ee1ff..f5dfd0979 100644
--- a/distrib/sets/lists/xbase/md.alpha
+++ b/distrib/sets/lists/xbase/md.alpha
@@ -114,6 +114,8 @@
 ./usr/X11R6/lib/pkgconfig/glw.pc
 ./usr/X11R6/lib/pkgconfig/libdrm.pc
 ./usr/X11R6/lib/pkgconfig/xf86driproto.pc
+./usr/X11R6/lib/xorg
+./usr/X11R6/lib/xorg/protocol.txt
 ./usr/X11R6/man/cat1/glxgears.0
 ./usr/X11R6/man/cat1/glxinfo.0
 ./usr/X11R6/man/man1/bdftruncate.1
diff --git a/distrib/sets/lists/xbase/md.amd64 b/distrib/sets/lists/xbase/md.amd64
index 524946d88..b5175dbc3 100644
--- a/distrib/sets/lists/xbase/md.amd64
+++ b/distrib/sets/lists/xbase/md.amd64
@@ -122,6 +122,8 @@
 ./usr/X11R6/lib/pkgconfig/glw.pc
 ./usr/X11R6/lib/pkgconfig/libdrm.pc
 ./usr/X11R6/lib/pkgconfig/xf86driproto.pc
+./usr/X11R6/lib/xorg
+./usr/X11R6/lib/xorg/protocol.txt
 ./usr/X11R6/man/cat1/glxgears.0
 ./usr/X11R6/man/cat1/glxinfo.0
 ./usr/X11R6/man/man1/bdftruncate.1
diff --git a/distrib/sets/lists/xbase/md.armish b/distrib/sets/lists/xbase/md.armish
index 14534fe41..a0b574fa7 100644
--- a/distrib/sets/lists/xbase/md.armish
+++ b/distrib/sets/lists/xbase/md.armish
@@ -114,6 +114,8 @@
 ./usr/X11R6/lib/pkgconfig/glw.pc
 ./usr/X11R6/lib/pkgconfig/libdrm.pc
 ./usr/X11R6/lib/pkgconfig/xf86driproto.pc
+./usr/X11R6/lib/xorg
+./usr/X11R6/lib/xorg/protocol.txt
 ./usr/X11R6/man/cat1/glxgears.0
 ./usr/X11R6/man/cat1/glxinfo.0
 ./usr/X11R6/man/man1/bdftruncate.1
diff --git a/distrib/sets/lists/xbase/md.hp300 b/distrib/sets/lists/xbase/md.hp300
index fa058cbcb..c051455da 100644
--- a/distrib/sets/lists/xbase/md.hp300
+++ b/distrib/sets/lists/xbase/md.hp300
@@ -80,6 +80,8 @@
 ./usr/X11R6/lib/pkgconfig/gl.pc
 ./usr/X11R6/lib/pkgconfig/glu.pc
 ./usr/X11R6/lib/pkgconfig/glw.pc
+./usr/X11R6/lib/xorg
+./usr/X11R6/lib/xorg/protocol.txt
 ./usr/X11R6/man/cat1/glxgears.0
 ./usr/X11R6/man/cat1/glxinfo.0
 ./usr/X11R6/man/man1/bdftruncate.1
diff --git a/distrib/sets/lists/xbase/md.hppa b/distrib/sets/lists/xbase/md.hppa
index 21111cbe7..1d8832236 100644
--- a/distrib/sets/lists/xbase/md.hppa
+++ b/distrib/sets/lists/xbase/md.hppa
@@ -95,6 +95,8 @@
 ./usr/X11R6/lib/pkgconfig/glw.pc
 ./usr/X11R6/lib/pkgconfig/libdrm.pc
 ./usr/X11R6/lib/pkgconfig/xf86driproto.pc
+./usr/X11R6/lib/xorg
+./usr/X11R6/lib/xorg/protocol.txt
 ./usr/X11R6/man/cat1/glxgears.0
 ./usr/X11R6/man/cat1/glxinfo.0
 ./usr/X11R6/man/man1/xfs.1
diff --git a/distrib/sets/lists/xbase/md.i386 b/distrib/sets/lists/xbase/md.i386
index e3f3743cb..159eb0247 100644
--- a/distrib/sets/lists/xbase/md.i386
+++ b/distrib/sets/lists/xbase/md.i386
@@ -122,6 +122,8 @@
 ./usr/X11R6/lib/pkgconfig/glw.pc
 ./usr/X11R6/lib/pkgconfig/libdrm.pc
 ./usr/X11R6/lib/pkgconfig/xf86driproto.pc
+./usr/X11R6/lib/xorg
+./usr/X11R6/lib/xorg/protocol.txt
 ./usr/X11R6/man/cat1/glxgears.0
 ./usr/X11R6/man/cat1/glxinfo.0
 ./usr/X11R6/man/man1/bdftruncate.1
diff --git a/distrib/sets/lists/xbase/md.landisk b/distrib/sets/lists/xbase/md.landisk
index ff9505b05..5d7fe0a35 100644
--- a/distrib/sets/lists/xbase/md.landisk
+++ b/distrib/sets/lists/xbase/md.landisk
@@ -12,13 +12,24 @@
 ./usr/X11R6/include/GL/glu.h
 ./usr/X11R6/include/GL/glx.h
 ./usr/X11R6/include/GL/glxext.h
+./usr/X11R6/include/GL/internal/dri_interface.h
 ./usr/X11R6/include/GL/osmesa.h
+./usr/X11R6/include/X11/dri/xf86dri.h
+./usr/X11R6/include/X11/dri/xf86dristr.h
+./usr/X11R6/include/drm/drm.h
+./usr/X11R6/include/drm/drm_sarea.h
+./usr/X11R6/include/drm/i915_drm.h
+./usr/X11R6/include/drm/mach64_drm.h
+./usr/X11R6/include/drm/mga_drm.h
+./usr/X11R6/include/drm/r128_drm.h
+./usr/X11R6/include/drm/r300_reg.h
+./usr/X11R6/include/drm/radeon_drm.h
+./usr/X11R6/include/drm/savage_drm.h
+./usr/X11R6/include/drm/sis_drm.h
+./usr/X11R6/include/drm/via_3d_reg.h
+./usr/X11R6/include/drm/via_drm.h
+./usr/X11R6/include/xf86drm.h
 ./usr/X11R6/include/xorg
-./usr/X11R6/include/xorg/dixaccess.h
-./usr/X11R6/include/xorg/privates.h
-./usr/X11R6/include/xorg/registry.h
-./usr/X11R6/include/xorg/xkbfile.h
-./usr/X11R6/include/xorg/xkbstr.h
 ./usr/X11R6/lib/libFS.so.8.0
 ./usr/X11R6/lib/libGL.a
 ./usr/X11R6/lib/libGL.so.8.0
@@ -68,6 +79,8 @@
 ./usr/X11R6/lib/libXxf86misc.so.5.0
 ./usr/X11R6/lib/libXxf86vm.so.5.0
 ./usr/X11R6/lib/libdmx.so.1.0
+./usr/X11R6/lib/libdrm.la
+./usr/X11R6/lib/libdrm.so.2.3
 ./usr/X11R6/lib/libfontconfig.so.5.1
 ./usr/X11R6/lib/libfontenc.so.3.0
 ./usr/X11R6/lib/libfreetype.so.16.1
@@ -81,6 +94,8 @@
 ./usr/X11R6/lib/pkgconfig/gl.pc
 ./usr/X11R6/lib/pkgconfig/glu.pc
 ./usr/X11R6/lib/pkgconfig/glw.pc
+./usr/X11R6/lib/pkgconfig/libdrm.pc
+./usr/X11R6/lib/pkgconfig/xf86driproto.pc
 ./usr/X11R6/man/cat1/glxgears.0
 ./usr/X11R6/man/cat1/glxinfo.0
 ./usr/X11R6/man/man1/bdftruncate.1
diff --git a/distrib/sets/lists/xbase/md.mac68k b/distrib/sets/lists/xbase/md.mac68k
index 7e42e4e56..9e72c8742 100644
--- a/distrib/sets/lists/xbase/md.mac68k
+++ b/distrib/sets/lists/xbase/md.mac68k
@@ -89,6 +89,8 @@
 ./usr/X11R6/lib/pkgconfig/gl.pc
 ./usr/X11R6/lib/pkgconfig/glu.pc
 ./usr/X11R6/lib/pkgconfig/glw.pc
+./usr/X11R6/lib/xorg
+./usr/X11R6/lib/xorg/protocol.txt
 ./usr/X11R6/man/cat1/glxgears.0
 ./usr/X11R6/man/cat1/glxinfo.0
 ./usr/X11R6/man/man1/bdftruncate.1
diff --git a/distrib/sets/lists/xbase/md.macppc b/distrib/sets/lists/xbase/md.macppc
index 4ad1d9a45..708818ae7 100644
--- a/distrib/sets/lists/xbase/md.macppc
+++ b/distrib/sets/lists/xbase/md.macppc
@@ -114,6 +114,8 @@
 ./usr/X11R6/lib/pkgconfig/glw.pc
 ./usr/X11R6/lib/pkgconfig/libdrm.pc
 ./usr/X11R6/lib/pkgconfig/xf86driproto.pc
+./usr/X11R6/lib/xorg
+./usr/X11R6/lib/xorg/protocol.txt
 ./usr/X11R6/man/cat1/glxgears.0
 ./usr/X11R6/man/cat1/glxinfo.0
 ./usr/X11R6/man/man1/bdftruncate.1
diff --git a/distrib/sets/lists/xbase/md.mvme68k b/distrib/sets/lists/xbase/md.mvme68k
index c035e64e1..e217528cd 100644
--- a/distrib/sets/lists/xbase/md.mvme68k
+++ b/distrib/sets/lists/xbase/md.mvme68k
@@ -79,6 +79,8 @@
 ./usr/X11R6/lib/pkgconfig/gl.pc
 ./usr/X11R6/lib/pkgconfig/glu.pc
 ./usr/X11R6/lib/pkgconfig/glw.pc
+./usr/X11R6/lib/xorg
+./usr/X11R6/lib/xorg/protocol.txt
 ./usr/X11R6/man/cat1/glxgears.0
 ./usr/X11R6/man/cat1/glxinfo.0
 ./usr/X11R6/man/man1/bdftruncate.1
diff --git a/distrib/sets/lists/xbase/md.mvme88k b/distrib/sets/lists/xbase/md.mvme88k
index 768c0cce3..80efc081d 100644
--- a/distrib/sets/lists/xbase/md.mvme88k
+++ b/distrib/sets/lists/xbase/md.mvme88k
@@ -6,6 +6,8 @@
 ./usr/X11R6/include/xorg/xkbstr.h
 ./usr/X11R6/lib/libGL.so.8.0
 ./usr/X11R6/lib/libpciaccess.so.0.10
+./usr/X11R6/lib/xorg
+./usr/X11R6/lib/xorg/protocol.txt
 ./usr/X11R6/man/man1/bdftruncate.1
 ./usr/X11R6/man/man1/dga.1
 ./usr/X11R6/man/man1/ucs2any.1
diff --git a/distrib/sets/lists/xbase/md.sgi b/distrib/sets/lists/xbase/md.sgi
index 520ce654a..6f103c3f5 100644
--- a/distrib/sets/lists/xbase/md.sgi
+++ b/distrib/sets/lists/xbase/md.sgi
@@ -110,6 +110,8 @@
 ./usr/X11R6/lib/pkgconfig/glw.pc
 ./usr/X11R6/lib/pkgconfig/libdrm.pc
 ./usr/X11R6/lib/pkgconfig/xf86driproto.pc
+./usr/X11R6/lib/xorg
+./usr/X11R6/lib/xorg/protocol.txt
 ./usr/X11R6/man/cat1/glxgears.0
 ./usr/X11R6/man/cat1/glxinfo.0
 ./usr/X11R6/man/man1/bdftruncate.1
diff --git a/distrib/sets/lists/xbase/md.sparc b/distrib/sets/lists/xbase/md.sparc
index 672f2922e..12ac0dd71 100644
--- a/distrib/sets/lists/xbase/md.sparc
+++ b/distrib/sets/lists/xbase/md.sparc
@@ -90,6 +90,8 @@
 ./usr/X11R6/lib/pkgconfig/gl.pc
 ./usr/X11R6/lib/pkgconfig/glu.pc
 ./usr/X11R6/lib/pkgconfig/glw.pc
+./usr/X11R6/lib/xorg
+./usr/X11R6/lib/xorg/protocol.txt
 ./usr/X11R6/man/cat1/glxgears.0
 ./usr/X11R6/man/cat1/glxinfo.0
 ./usr/X11R6/man/man1/bdftruncate.1
diff --git a/distrib/sets/lists/xbase/md.sparc64 b/distrib/sets/lists/xbase/md.sparc64
index 4b016a580..7f9cb5af3 100644
--- a/distrib/sets/lists/xbase/md.sparc64
+++ b/distrib/sets/lists/xbase/md.sparc64
@@ -114,6 +114,8 @@
 ./usr/X11R6/lib/pkgconfig/glw.pc
 ./usr/X11R6/lib/pkgconfig/libdrm.pc
 ./usr/X11R6/lib/pkgconfig/xf86driproto.pc
+./usr/X11R6/lib/xorg
+./usr/X11R6/lib/xorg/protocol.txt
 ./usr/X11R6/man/cat1/glxgears.0
 ./usr/X11R6/man/cat1/glxinfo.0
 ./usr/X11R6/man/man1/bdftruncate.1
diff --git a/distrib/sets/lists/xbase/md.vax b/distrib/sets/lists/xbase/md.vax
index f70612d90..d7a14c2bb 100644
--- a/distrib/sets/lists/xbase/md.vax
+++ b/distrib/sets/lists/xbase/md.vax
@@ -5,6 +5,8 @@
 ./usr/X11R6/include/xorg/registry.h
 ./usr/X11R6/include/xorg/xkbfile.h
 ./usr/X11R6/include/xorg/xkbstr.h
+./usr/X11R6/lib/xorg
+./usr/X11R6/lib/xorg/protocol.txt
 ./usr/X11R6/man/man1/bdftruncate.1
 ./usr/X11R6/man/man1/dga.1
 ./usr/X11R6/man/man1/ucs2any.1
diff --git a/distrib/sets/lists/xbase/md.zaurus b/distrib/sets/lists/xbase/md.zaurus
index 14534fe41..a0b574fa7 100644
--- a/distrib/sets/lists/xbase/md.zaurus
+++ b/distrib/sets/lists/xbase/md.zaurus
@@ -114,6 +114,8 @@
 ./usr/X11R6/lib/pkgconfig/glw.pc
 ./usr/X11R6/lib/pkgconfig/libdrm.pc
 ./usr/X11R6/lib/pkgconfig/xf86driproto.pc
+./usr/X11R6/lib/xorg
+./usr/X11R6/lib/xorg/protocol.txt
 ./usr/X11R6/man/cat1/glxgears.0
 ./usr/X11R6/man/cat1/glxinfo.0
 ./usr/X11R6/man/man1/bdftruncate.1
diff --git a/distrib/sets/lists/xserv/md.landisk b/distrib/sets/lists/xserv/md.landisk
index 89d309cae..3b2cdc7eb 100644
--- a/distrib/sets/lists/xserv/md.landisk
+++ b/distrib/sets/lists/xserv/md.landisk
@@ -1,3 +1,4 @@
+./usr/X11R6/lib/modules/dri/swrast_dri.so
 ./usr/X11R6/man/man3/XFree86-DGA.3
 ./usr/X11R6/man/man7/Xprint.7
 ./var/db/xkb
diff --git a/distrib/sets/lists/xshare/mi b/distrib/sets/lists/xshare/mi
index 6f593e9e3..35d26364b 100644
--- a/distrib/sets/lists/xshare/mi
+++ b/distrib/sets/lists/xshare/mi
@@ -898,8 +898,6 @@
 ./usr/X11R6/lib/pkgconfig/xxf86dga.pc
 ./usr/X11R6/lib/pkgconfig/xxf86misc.pc
 ./usr/X11R6/lib/pkgconfig/xxf86vm.pc
-./usr/X11R6/lib/xorg
-./usr/X11R6/lib/xorg/protocol.txt
 ./usr/X11R6/man/cat1/FvwmAuto.0
 ./usr/X11R6/man/cat1/FvwmBacker.0
 ./usr/X11R6/man/cat1/FvwmBanner.0