diff --git a/distrib/sets/lists/xbase/md.amd64 b/distrib/sets/lists/xbase/md.amd64
index 38e611758..8960d2bc3 100644
--- a/distrib/sets/lists/xbase/md.amd64
+++ b/distrib/sets/lists/xbase/md.amd64
@@ -446,11 +446,26 @@
 ./usr/X11R6/include/X11/pixmaps/keyboard.xpm
 ./usr/X11R6/include/X11/pixmaps/monitor.xpm
 ./usr/X11R6/include/X11/pixmaps/mouse.xpm
+./usr/X11R6/include/drm
+./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/freetype2/freetype/ftgzip.h
 ./usr/X11R6/include/freetype2/freetype/ftincrem.h
 ./usr/X11R6/include/freetype2/freetype/ftpfr.h
 ./usr/X11R6/include/freetype2/freetype/ftwinfnt.h
 ./usr/X11R6/include/ft2build.h
+./usr/X11R6/include/xf86drm.h
+./usr/X11R6/include/xf86mm.h
 ./usr/X11R6/lib/X11/Cards
 ./usr/X11R6/lib/X11/Options
 ./usr/X11R6/lib/libFS.so.8.0
@@ -505,6 +520,8 @@
 ./usr/X11R6/lib/libXxf86misc.so.4.0
 ./usr/X11R6/lib/libXxf86vm.so.4.0
 ./usr/X11R6/lib/libdmx.so.1.0
+./usr/X11R6/lib/libdrm.la
+./usr/X11R6/lib/libdrm.so.2.3
 ./usr/X11R6/lib/libexpat.so.6.0
 ./usr/X11R6/lib/libfontconfig.so.5.1
 ./usr/X11R6/lib/libfontenc.so.3.0
@@ -514,6 +531,7 @@
 ./usr/X11R6/lib/libxkbfile.so.3.0
 ./usr/X11R6/lib/libxkbui.so.3.0
 ./usr/X11R6/lib/modules
+./usr/X11R6/lib/pkgconfig/libdrm.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 8cc2264bb..36ad178a5 100644
--- a/distrib/sets/lists/xserv/md.amd64
+++ b/distrib/sets/lists/xserv/md.amd64
@@ -231,8 +231,6 @@
 ./usr/X11R6/lib/modules/drivers/vga_drv.so
 ./usr/X11R6/lib/modules/drivers/vmware_drv.la
 ./usr/X11R6/lib/modules/drivers/vmware_drv.so
-./usr/X11R6/lib/modules/drivers/wsfb_drv.la
-./usr/X11R6/lib/modules/drivers/wsfb_drv.so
 ./usr/X11R6/lib/modules/extensions
 ./usr/X11R6/lib/modules/extensions/libGLcore.la
 ./usr/X11R6/lib/modules/extensions/libGLcore.so
@@ -413,7 +411,6 @@
 ./usr/X11R6/man/man4/vmmouse.4
 ./usr/X11R6/man/man4/vmware.4
 ./usr/X11R6/man/man4/void.4
-./usr/X11R6/man/man4/wsfb.4
 ./usr/X11R6/man/man5/xorg.conf.5
 ./usr/X11R6/share/X11/xserver
 ./usr/X11R6/share/X11/xserver/C