diff --git a/distrib/sets/lists/xbase/shl.elf b/distrib/sets/lists/xbase/shl.elf
index 8de10cb566b6..767cd280997a 100644
--- a/distrib/sets/lists/xbase/shl.elf
+++ b/distrib/sets/lists/xbase/shl.elf
@@ -1,4 +1,4 @@
-# $NetBSD: shl.elf,v 1.9 2004/08/12 16:13:59 lukem Exp $
+# $NetBSD: shl.elf,v 1.10 2005/03/22 13:45:46 tron Exp $
 ./usr/X11R6/lib/X11/locale/lib/common/ximcp.so.2
 ./usr/X11R6/lib/X11/locale/lib/common/xlcDef.so.2
 ./usr/X11R6/lib/X11/locale/lib/common/xlcUTF8Load.so.2
@@ -76,6 +76,8 @@
 ./usr/X11R6/lib/libXxf86misc.so.1
 ./usr/X11R6/lib/libXxf86vm.so
 ./usr/X11R6/lib/libXxf86vm.so.1
+./usr/X11R6/lib/libdmx.so
+./usr/X11R6/lib/libdmx.so.1
 ./usr/X11R6/lib/libdps.so
 ./usr/X11R6/lib/libdps.so.1
 ./usr/X11R6/lib/libdpstk.so
diff --git a/distrib/sets/lists/xbase/shl.mi b/distrib/sets/lists/xbase/shl.mi
index dec3fd369971..344c0d2b1ff4 100644
--- a/distrib/sets/lists/xbase/shl.mi
+++ b/distrib/sets/lists/xbase/shl.mi
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.8 2005/03/21 14:43:44 tron Exp $
+# $NetBSD: shl.mi,v 1.9 2005/03/22 13:45:46 tron Exp $
 ./usr/X11R6/lib/libFS.so.6.0
 ./usr/X11R6/lib/libGL.so.1.2
 ./usr/X11R6/lib/libGLU.so.1.3
@@ -34,6 +34,7 @@
 ./usr/X11R6/lib/libXxf86dga.so.1.1
 ./usr/X11R6/lib/libXxf86misc.so.1.1
 ./usr/X11R6/lib/libXxf86vm.so.1.0
+./usr/X11R6/lib/libdmx.so.1.0
 ./usr/X11R6/lib/libdps.so.1.0
 ./usr/X11R6/lib/libdpstk.so.1.0
 ./usr/X11R6/lib/libexpat.so.4.0
diff --git a/distrib/sets/lists/xcomp/mi b/distrib/sets/lists/xcomp/mi
index 62c9b6af21c0..3fc9a07ade28 100644
--- a/distrib/sets/lists/xcomp/mi
+++ b/distrib/sets/lists/xcomp/mi
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.25 2005/03/21 14:43:44 tron Exp $
+# $NetBSD: mi,v 1.26 2005/03/22 13:45:46 tron Exp $
 ./etc/mtree/set.xcomp			xcomp-sys-root
 ./usr/X11R6/bin/bdftruncate.pl		xcomp-obsolete	obsolete
 ./usr/X11R6/bin/ccmakedep
@@ -604,6 +604,8 @@
 ./usr/X11R6/lib/libXxf86misc_p.a		-unknown-	profile
 ./usr/X11R6/lib/libXxf86vm.a
 ./usr/X11R6/lib/libXxf86vm_p.a		-unknown-	profile
+./usr/X11R6/lib/libdmx.a
+./usr/X11R6/lib/libdmx_p.a		-unknown-	profile
 ./usr/X11R6/lib/libdps.a
 ./usr/X11R6/lib/libdps_p.a		-unknown-	profile
 ./usr/X11R6/lib/libdpstk.a
@@ -3797,6 +3799,7 @@
 ./usr/libdata/lint/llib-lXxf86dga.ln		-unknown-		lint
 ./usr/libdata/lint/llib-lXxf86misc.ln		-unknown-		lint
 ./usr/libdata/lint/llib-lXxf86vm.ln		-unknown-		lint
+./usr/libdata/lint/llib-ldmx.ln			-unknown-		lint
 ./usr/libdata/lint/llib-ldps.ln			-unknown-		lint
 ./usr/libdata/lint/llib-ldpstk.ln		-unknown-		lint
 ./usr/libdata/lint/llib-lexpat.ln		-unknown-		lint
diff --git a/distrib/sets/lists/xcomp/shl.mi b/distrib/sets/lists/xcomp/shl.mi
index 8debbed2ddf9..923fa21c65fb 100644
--- a/distrib/sets/lists/xcomp/shl.mi
+++ b/distrib/sets/lists/xcomp/shl.mi
@@ -1,4 +1,4 @@
-#	$NetBSD: shl.mi,v 1.2 2004/03/06 03:54:24 rtr Exp $
+#	$NetBSD: shl.mi,v 1.3 2005/03/22 13:45:46 tron Exp $
 ./usr/X11R6/lib/libFS_pic.a
 ./usr/X11R6/lib/libGLU_pic.a
 ./usr/X11R6/lib/libGL_pic.a
@@ -33,6 +33,7 @@
 ./usr/X11R6/lib/libXxf86dga_pic.a
 ./usr/X11R6/lib/libXxf86misc_pic.a
 ./usr/X11R6/lib/libXxf86vm_pic.a
+./usr/X11R6/lib/libdmx_pic.a
 ./usr/X11R6/lib/libdps_pic.a
 ./usr/X11R6/lib/libdpstk_pic.a
 ./usr/X11R6/lib/libexpat_pic.a
diff --git a/distrib/sets/lists/xserver/mi b/distrib/sets/lists/xserver/mi
index e3d914d00687..5d14dbcc54f7 100644
--- a/distrib/sets/lists/xserver/mi
+++ b/distrib/sets/lists/xserver/mi
@@ -1,15 +1,38 @@
-# $NetBSD: mi,v 1.15 2005/03/21 14:43:44 tron Exp $
+# $NetBSD: mi,v 1.16 2005/03/22 13:45:46 tron Exp $
 ./etc/mtree/set.xserver				xserver-sys-root
 ./usr/X11R6/bin/Xdmx
 ./usr/X11R6/bin/Xnest
 ./usr/X11R6/bin/Xprt
+./usr/X11R6/bin/dmxaddinput
+./usr/X11R6/bin/dmxaddscreen
+./usr/X11R6/bin/dmxreconfig
+./usr/X11R6/bin/dmxresize
+./usr/X11R6/bin/dmxrminput
+./usr/X11R6/bin/dmxrmscreen
+./usr/X11R6/bin/dmxtodmx
+./usr/X11R6/bin/dmxwininfo
+./usr/X11R6/bin/evi
+./usr/X11R6/bin/res
+./usr/X11R6/bin/vdltodmx
+./usr/X11R6/bin/xbell
+./usr/X11R6/bin/xdmx
+./usr/X11R6/bin/xdmxconfig
+./usr/X11R6/bin/xinput
+./usr/X11R6/bin/xled
+./usr/X11R6/bin/xtest
 ./usr/X11R6/bin/xvidtune
 ./usr/X11R6/lib/X11/app-defaults/Xvidtune
 ./usr/X11R6/man/cat1/Xdmx.0			-unknown-		.cat
 ./usr/X11R6/man/cat1/Xnest.0			-unknown-		.cat
 ./usr/X11R6/man/cat1/Xserver.0			-unknown-		.cat
+./usr/X11R6/man/cat1/dmxtodmx.0			-unknown-		.cat
+./usr/X11R6/man/cat1/vdltodmx.0			-unknown-		.cat
+./usr/X11R6/man/cat1/xdmxconfig.0		-unknown-		.cat
 ./usr/X11R6/man/cat1/xvidtune.0			-unknown-		.cat
 ./usr/X11R6/man/man1/Xdmx.1			-unknown-		.man
 ./usr/X11R6/man/man1/Xnest.1			-unknown-		.man
 ./usr/X11R6/man/man1/Xserver.1			-unknown-		.man
+./usr/X11R6/man/man1/dmxtodmx.1			-unknown-		.man
+./usr/X11R6/man/man1/vdltodmx.1			-unknown-		.man
+./usr/X11R6/man/man1/xdmxconfig.1		-unknown-		.man
 ./usr/X11R6/man/man1/xvidtune.1			-unknown-		.man