diff --git a/distrib/sets/lists/xbase/md.amd64 b/distrib/sets/lists/xbase/md.amd64
index c9f932d50..bee0cdd28 100644
--- a/distrib/sets/lists/xbase/md.amd64
+++ b/distrib/sets/lists/xbase/md.amd64
@@ -410,15 +410,36 @@
 ./usr/X11R6/include/GL/glxproto.h
 ./usr/X11R6/include/GL/glxtokens.h
 ./usr/X11R6/include/GL/internal
+./usr/X11R6/include/GL/internal/dri_interface.h
 ./usr/X11R6/include/GL/internal/glcore.h
 ./usr/X11R6/include/GL/osmesa.h
+./usr/X11R6/include/X11/dri
+./usr/X11R6/include/X11/dri/xf86dri.h
+./usr/X11R6/include/X11/dri/xf86dristr.h
 ./usr/X11R6/include/X11/extensions/xf86dga.h
 ./usr/X11R6/include/X11/extensions/xf86dga1.h
 ./usr/X11R6/include/X11/extensions/xf86dga1str.h
 ./usr/X11R6/include/X11/extensions/xf86dgastr.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/pixman-1/pixman-version.h
 ./usr/X11R6/include/pixman-1/pixman.h
+./usr/X11R6/include/xf86drm.h
+./usr/X11R6/include/xf86mm.h
+./usr/X11R6/include/xorg/dri.h
+./usr/X11R6/include/xorg/dristruct.h
 ./usr/X11R6/include/xorg/hotplug.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
@@ -439,6 +460,8 @@
 ./usr/X11R6/lib/libGLw.a
 ./usr/X11R6/lib/libGLw.so.5.1
 ./usr/X11R6/lib/libGLw_pic.a
+./usr/X11R6/lib/libI810XvMC.la
+./usr/X11R6/lib/libI810XvMC.so.1.0
 ./usr/X11R6/lib/libICE.so.8.1
 ./usr/X11R6/lib/libSM.so.8.0
 ./usr/X11R6/lib/libX11.so.11.1
@@ -480,6 +503,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.0
@@ -494,7 +519,9 @@
 ./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/pixman-1.pc
+./usr/X11R6/lib/pkgconfig/xf86driproto.pc
 ./usr/X11R6/man/cat1/glxgears.0
 ./usr/X11R6/man/cat1/glxinfo.0
 ./usr/X11R6/man/cat3/GLwCreateMDrawingArea.0
diff --git a/distrib/sets/lists/xbase/md.i386 b/distrib/sets/lists/xbase/md.i386
index a24d40e50..27d7b3e5f 100644
--- a/distrib/sets/lists/xbase/md.i386
+++ b/distrib/sets/lists/xbase/md.i386
@@ -410,8 +410,12 @@
 ./usr/X11R6/include/GL/glxproto.h
 ./usr/X11R6/include/GL/glxtokens.h
 ./usr/X11R6/include/GL/internal
+./usr/X11R6/include/GL/internal/dri_interface.h
 ./usr/X11R6/include/GL/internal/glcore.h
 ./usr/X11R6/include/GL/osmesa.h
+./usr/X11R6/include/X11/dri
+./usr/X11R6/include/X11/dri/xf86dri.h
+./usr/X11R6/include/X11/dri/xf86dristr.h
 ./usr/X11R6/include/X11/extensions/xf86dga.h
 ./usr/X11R6/include/X11/extensions/xf86dga1.h
 ./usr/X11R6/include/X11/extensions/xf86dga1str.h
@@ -432,7 +436,10 @@
 ./usr/X11R6/include/pixman-1/pixman.h
 ./usr/X11R6/include/xf86drm.h
 ./usr/X11R6/include/xf86mm.h
+./usr/X11R6/include/xorg/dri.h
+./usr/X11R6/include/xorg/dristruct.h
 ./usr/X11R6/include/xorg/hotplug.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
@@ -453,6 +460,8 @@
 ./usr/X11R6/lib/libGLw.a
 ./usr/X11R6/lib/libGLw.so.5.1
 ./usr/X11R6/lib/libGLw_pic.a
+./usr/X11R6/lib/libI810XvMC.la
+./usr/X11R6/lib/libI810XvMC.so.1.0
 ./usr/X11R6/lib/libICE.so.8.1
 ./usr/X11R6/lib/libSM.so.8.0
 ./usr/X11R6/lib/libX11.so.11.1
@@ -505,6 +514,10 @@
 ./usr/X11R6/lib/libpixman-1.a
 ./usr/X11R6/lib/libpixman-1.la
 ./usr/X11R6/lib/libpixman-1.so.11.0
+./usr/X11R6/lib/libviaXvMC.la
+./usr/X11R6/lib/libviaXvMC.so.1.0
+./usr/X11R6/lib/libviaXvMCPro.la
+./usr/X11R6/lib/libviaXvMCPro.so.1.0
 ./usr/X11R6/lib/libxkbfile.so.4.0
 ./usr/X11R6/lib/libxkbui.so.4.0
 ./usr/X11R6/lib/pkgconfig/gl.pc
@@ -512,6 +525,7 @@
 ./usr/X11R6/lib/pkgconfig/glw.pc
 ./usr/X11R6/lib/pkgconfig/libdrm.pc
 ./usr/X11R6/lib/pkgconfig/pixman-1.pc
+./usr/X11R6/lib/pkgconfig/xf86driproto.pc
 ./usr/X11R6/man/cat1/glxgears.0
 ./usr/X11R6/man/cat1/glxinfo.0
 ./usr/X11R6/man/cat3/GLwCreateMDrawingArea.0
diff --git a/distrib/sets/lists/xserv/md.amd64 b/distrib/sets/lists/xserv/md.amd64
index 1297a8584..d3772c48b 100644
--- a/distrib/sets/lists/xserv/md.amd64
+++ b/distrib/sets/lists/xserv/md.amd64
@@ -165,6 +165,19 @@
 ./usr/X11R6/include/xorg/xvdix.h
 ./usr/X11R6/include/xorg/xvmcext.h
 ./usr/X11R6/lib/modules
+./usr/X11R6/lib/modules/dri/i810_dri.so
+./usr/X11R6/lib/modules/dri/i915_dri.so
+./usr/X11R6/lib/modules/dri/i965_dri.so
+./usr/X11R6/lib/modules/dri/mach64_dri.so
+./usr/X11R6/lib/modules/dri/mga_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/savage_dri.so
+./usr/X11R6/lib/modules/dri/sis_dri.so
+./usr/X11R6/lib/modules/dri/tdfx_dri.so
+./usr/X11R6/lib/modules/dri/unichrome_dri.so
 ./usr/X11R6/lib/modules/drivers
 ./usr/X11R6/lib/modules/drivers/apm_drv.la
 ./usr/X11R6/lib/modules/drivers/apm_drv.so
@@ -243,6 +256,8 @@
 ./usr/X11R6/lib/modules/extensions/libGLcore.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
diff --git a/distrib/sets/lists/xserv/md.i386 b/distrib/sets/lists/xserv/md.i386
index dd3de1d06..b2cf695f5 100644
--- a/distrib/sets/lists/xserv/md.i386
+++ b/distrib/sets/lists/xserv/md.i386
@@ -165,6 +165,19 @@
 ./usr/X11R6/include/xorg/xvdix.h
 ./usr/X11R6/include/xorg/xvmcext.h
 ./usr/X11R6/lib/modules
+./usr/X11R6/lib/modules/dri/i810_dri.so
+./usr/X11R6/lib/modules/dri/i915_dri.so
+./usr/X11R6/lib/modules/dri/i965_dri.so
+./usr/X11R6/lib/modules/dri/mach64_dri.so
+./usr/X11R6/lib/modules/dri/mga_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/savage_dri.so
+./usr/X11R6/lib/modules/dri/sis_dri.so
+./usr/X11R6/lib/modules/dri/tdfx_dri.so
+./usr/X11R6/lib/modules/dri/unichrome_dri.so
 ./usr/X11R6/lib/modules/drivers
 ./usr/X11R6/lib/modules/drivers/apm_drv.la
 ./usr/X11R6/lib/modules/drivers/apm_drv.so
@@ -253,6 +266,8 @@
 ./usr/X11R6/lib/modules/extensions/libGLcore.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