diff --git a/distrib/sets/lists/xbase/md.sgi b/distrib/sets/lists/xbase/md.sgi
index aa7033715..520ce654a 100644
--- a/distrib/sets/lists/xbase/md.sgi
+++ b/distrib/sets/lists/xbase/md.sgi
@@ -12,12 +12,31 @@
 ./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/dri.h
+./usr/X11R6/include/xorg/dristruct.h
 ./usr/X11R6/include/xorg/hotplug.h
 ./usr/X11R6/include/xorg/privates.h
 ./usr/X11R6/include/xorg/registry.h
+./usr/X11R6/include/xorg/sarea.h
 ./usr/X11R6/include/xorg/wfbrename.h
 ./usr/X11R6/include/xorg/xf86Crtc.h
 ./usr/X11R6/include/xorg/xf86Modes.h
@@ -75,6 +94,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
@@ -87,6 +108,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.sparc64 b/distrib/sets/lists/xbase/md.sparc64
index b2c3b2ea5..4b016a580 100644
--- a/distrib/sets/lists/xbase/md.sparc64
+++ b/distrib/sets/lists/xbase/md.sparc64
@@ -12,11 +12,30 @@
 ./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/dixaccess.h
+./usr/X11R6/include/xorg/dri.h
+./usr/X11R6/include/xorg/dristruct.h
 ./usr/X11R6/include/xorg/hotplug.h
 ./usr/X11R6/include/xorg/privates.h
 ./usr/X11R6/include/xorg/registry.h
+./usr/X11R6/include/xorg/sarea.h
 ./usr/X11R6/include/xorg/wfbrename.h
 ./usr/X11R6/include/xorg/xf86Crtc.h
 ./usr/X11R6/include/xorg/xf86Modes.h
@@ -78,6 +97,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
@@ -91,6 +112,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
@@ -162,26 +185,3 @@
 ./var/cache/fontconfig/be2547a64937fd44a1f33dfd1eea53e8-ppc64.cache-2
 ./var/cache/fontconfig/d929d2c542e4f6652ca46d613e4b360e-ppc64.cache-2
 ./var/cache/fontconfig/f8033d5e4c6effb98c84b18a50eef42d-ppc64.cache-2
-./usr/X11R6/include/GL/internal/dri_interface.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/dri.h
-./usr/X11R6/include/xorg/dristruct.h
-./usr/X11R6/include/xorg/sarea.h
-./usr/X11R6/lib/libdrm.la
-./usr/X11R6/lib/libdrm.so.2.3
-./usr/X11R6/lib/pkgconfig/libdrm.pc
-./usr/X11R6/lib/pkgconfig/xf86driproto.pc
diff --git a/distrib/sets/lists/xserv/md.armish b/distrib/sets/lists/xserv/md.armish
index 2a463b36f..91bbb4273 100644
--- a/distrib/sets/lists/xserv/md.armish
+++ b/distrib/sets/lists/xserv/md.armish
@@ -153,10 +153,13 @@
 ./usr/X11R6/include/xorg/xorgVersion.h
 ./usr/X11R6/include/xorg/xvdix.h
 ./usr/X11R6/include/xorg/xvmcext.h
+./usr/X11R6/lib/modules/dri/swrast_dri.so
 ./usr/X11R6/lib/modules/drivers/wsfb_drv.la
 ./usr/X11R6/lib/modules/drivers/wsfb_drv.so
 ./usr/X11R6/lib/modules/extensions/libdbe.la
 ./usr/X11R6/lib/modules/extensions/libdbe.so
+./usr/X11R6/lib/modules/extensions/libdri.la
+./usr/X11R6/lib/modules/extensions/libdri.so
 ./usr/X11R6/lib/modules/extensions/libextmod.la
 ./usr/X11R6/lib/modules/extensions/libextmod.so
 ./usr/X11R6/lib/modules/extensions/libglx.la
@@ -245,6 +248,3 @@
 ./usr/X11R6/share/aclocal/xorg-server.m4
 ./var/db/xkb
 ./var/log
-xbase/md.armish:./usr/X11R6/lib/modules/dri/swrast_dri.so
-xbase/md.armish:./usr/X11R6/lib/modules/extensions/libdri.la
-xbase/md.armish:./usr/X11R6/lib/modules/extensions/libdri.so
diff --git a/distrib/sets/lists/xserv/md.sgi b/distrib/sets/lists/xserv/md.sgi
index e69bb21d4..9ba0fc48a 100644
--- a/distrib/sets/lists/xserv/md.sgi
+++ b/distrib/sets/lists/xserv/md.sgi
@@ -149,15 +149,17 @@
 ./usr/X11R6/include/xorg/xorgVersion.h
 ./usr/X11R6/include/xorg/xvdix.h
 ./usr/X11R6/include/xorg/xvmcext.h
-./usr/X11R6/lib/modules/dri/s3v_dri.so
 ./usr/X11R6/lib/modules/dri/swrast_dri.so
-./usr/X11R6/lib/modules/dri/trident_dri.so
 ./usr/X11R6/lib/modules/drivers/wsfb_drv.la
 ./usr/X11R6/lib/modules/drivers/wsfb_drv.so
 ./usr/X11R6/lib/modules/extensions/libdbe.la
 ./usr/X11R6/lib/modules/extensions/libdbe.so
+./usr/X11R6/lib/modules/extensions/libdri.la
+./usr/X11R6/lib/modules/extensions/libdri.so
 ./usr/X11R6/lib/modules/extensions/libextmod.la
 ./usr/X11R6/lib/modules/extensions/libextmod.so
+./usr/X11R6/lib/modules/extensions/libglx.la
+./usr/X11R6/lib/modules/extensions/libglx.so
 ./usr/X11R6/lib/modules/fonts/libfreetype.la
 ./usr/X11R6/lib/modules/fonts/libfreetype.so
 ./usr/X11R6/lib/modules/input/kbd_drv.la
diff --git a/distrib/sets/lists/xserv/md.sparc64 b/distrib/sets/lists/xserv/md.sparc64
index 9b35a0c9a..af9710b9c 100644
--- a/distrib/sets/lists/xserv/md.sparc64
+++ b/distrib/sets/lists/xserv/md.sparc64
@@ -153,6 +153,11 @@
 ./usr/X11R6/include/xorg/xorgVersion.h
 ./usr/X11R6/include/xorg/xvdix.h
 ./usr/X11R6/include/xorg/xvmcext.h
+./usr/X11R6/lib/modules/dri/mach64_dri.so
+./usr/X11R6/lib/modules/dri/r128_dri.so
+./usr/X11R6/lib/modules/dri/r200_dri.so
+./usr/X11R6/lib/modules/dri/r300_dri.so
+./usr/X11R6/lib/modules/dri/radeon_dri.so
 ./usr/X11R6/lib/modules/dri/swrast_dri.so
 ./usr/X11R6/lib/modules/drivers/ati_drv.la
 ./usr/X11R6/lib/modules/drivers/ati_drv.so
@@ -168,6 +173,8 @@
 ./usr/X11R6/lib/modules/drivers/wsfb_drv.so
 ./usr/X11R6/lib/modules/extensions/libdbe.la
 ./usr/X11R6/lib/modules/extensions/libdbe.so
+./usr/X11R6/lib/modules/extensions/libdri.la
+./usr/X11R6/lib/modules/extensions/libdri.so
 ./usr/X11R6/lib/modules/extensions/libextmod.la
 ./usr/X11R6/lib/modules/extensions/libextmod.so
 ./usr/X11R6/lib/modules/extensions/libglx.la
@@ -320,10 +327,3 @@
 ./usr/X11R6/share/aclocal/xorg-server.m4
 ./var/db/xkb
 ./var/log
-./usr/X11R6/lib/modules/dri/mach64_dri.so
-./usr/X11R6/lib/modules/dri/r128_dri.so
-./usr/X11R6/lib/modules/dri/r200_dri.so
-./usr/X11R6/lib/modules/dri/r300_dri.so
-./usr/X11R6/lib/modules/dri/radeon_dri.so
-./usr/X11R6/lib/modules/extensions/libdri.la
-./usr/X11R6/lib/modules/extensions/libdri.so