diff --git a/x11/Xserver/Makefile.common b/x11/Xserver/Makefile.common
index 19ab45933b9e..aea72bad63d2 100644
--- a/x11/Xserver/Makefile.common
+++ b/x11/Xserver/Makefile.common
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.common,v 1.20 2005/01/09 21:45:53 fredb Exp $
+#	$NetBSD: Makefile.common,v 1.21 2005/03/21 00:49:17 rtr Exp $
 
 # These define parts of the Xserver tree that are to be
 # conditionally compiled for different platforms.  See
@@ -103,6 +103,8 @@ XSERVER_XAMIGA?=no
 XSERVER_XARM32VIDC?=	no
 # Does this platform build the XdecNetBSD server?
 XSERVER_XDECNETBSD?=	no
+# Does this platform build the Xdmx server?
+XSERVER_XDMX?=		yes
 # Does this platform build the Xdreamcast server?
 XSERVER_XDREAMCAST?=	no
 # Does this platform build the Xnewsmips server?
diff --git a/x11/Xserver/Xext/Makefile.ext b/x11/Xserver/Xext/Makefile.ext
index 543b21d53403..0d23120c79e3 100644
--- a/x11/Xserver/Xext/Makefile.ext
+++ b/x11/Xserver/Xext/Makefile.ext
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.ext,v 1.9 2004/05/16 10:25:14 lukem Exp $
+#	$NetBSD: Makefile.ext,v 1.10 2005/03/21 00:49:17 rtr Exp $
 
 .PATH:		${X11SRCDIR.xc}/programs/Xserver/Xext
 
@@ -11,6 +11,7 @@ CPPFLAGS+=	-I${X11SRCDIR.xc}/programs/Xserver/Xext \
 		-I${X11SRCDIR.xc}/include/fonts \
 		-I${X11SRCDIR.xc}/programs/Xserver/mi \
 		-I${X11SRCDIR.xc}/programs/Xserver/render \
+		-I${X11SRCDIR.xc}/programs/Xserver/hw/dmx \
 		-I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common
 
 CPPFLAGS+=	${X11FLAGS.EXTENSION}
diff --git a/x11/Xserver/Xext/ext/Makefile b/x11/Xserver/Xext/ext/Makefile
index 6dead539a70c..a860a058f143 100644
--- a/x11/Xserver/Xext/ext/Makefile
+++ b/x11/Xserver/Xext/ext/Makefile
@@ -1,11 +1,11 @@
-#	$NetBSD: Makefile,v 1.4 2004/05/16 10:25:14 lukem Exp $
+#	$NetBSD: Makefile,v 1.5 2005/03/21 00:49:17 rtr Exp $
 
 LIB=		ext
 SRCS=		EVI.c appgroup.c bigreq.c cup.c dpms.c fontcache.c mitmisc.c \
 		panoramiX.c panoramiXSwap.c panoramiXprocs.c sampleEVI.c \
 		saver.c security.c shape.c shm.c sleepuntil.c sync.c \
 		xcmisc.c xf86bigfont.c xprint.c xres.c xtest.c xtest1dd.c \
-		xtest1di.c xvdisp.c xvmain.c xvmc.c
+		xtest1di.c xvdisp.c xvmain.c xvmc.c dmx.c
 
 .if ${MACHINE} != "sparc"
 SRCS+=	xf86vmode.c xf86misc.c xf86dga.c xf86dga2.c
diff --git a/x11/Xserver/Xserver/Makefile b/x11/Xserver/Xserver/Makefile
index 887e2f917445..7293d751efd6 100644
--- a/x11/Xserver/Xserver/Makefile
+++ b/x11/Xserver/Xserver/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.15 2004/08/01 18:52:03 uch Exp $
+#	$NetBSD: Makefile,v 1.16 2005/03/21 00:49:17 rtr Exp $
 
 .include <bsd.own.mk>
 
@@ -26,6 +26,10 @@ SUBDIR+=	Xarm32VIDC
 SUBDIR+=	XdecNetBSD
 .endif
 
+.if ${XSERVER_XDMX} != "no"
+SUBDIR+=	Xdmx
+.endif
+
 .if ${XSERVER_XDREAMCAST} != "no"
 SUBDIR+=	Xdreamcast
 .endif
diff --git a/x11/Xserver/Xserver/Makefile.Xserver b/x11/Xserver/Xserver/Makefile.Xserver
index 7275ea877dde..1de055fd99c4 100644
--- a/x11/Xserver/Xserver/Makefile.Xserver
+++ b/x11/Xserver/Xserver/Makefile.Xserver
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.Xserver,v 1.18 2005/02/24 14:53:15 christos Exp $
+#	$NetBSD: Makefile.Xserver,v 1.19 2005/03/21 00:49:17 rtr Exp $
 
 .for _SL in	dix os mi printer printer/pcl printer/ps printer/raster \
 		Xext/ext Xext/exts GL/glx GL/GLcore xkb xinput lbx dbe \
@@ -6,6 +6,9 @@
 		cfb cfb16 cfb24 cfb32 fb \
 		hw/xnest hw/vfb fontbase afb \
 		\
+		hw/dmx hw/dmx/dmxinput hw/dmx/dmxconfig \
+		\
+		miext/shadow \
 		dix/xpstubs hw/sun hw/xfree86/xf86 hw/xfree86/xf86_os \
 		hw/xfree86/xf86config hw/xfree86/loader \
 		\
diff --git a/x11/Xserver/hw/Makefile b/x11/Xserver/hw/Makefile
index d6212435c03b..d240206cdd08 100644
--- a/x11/Xserver/hw/Makefile
+++ b/x11/Xserver/hw/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.13 2004/08/01 18:52:03 uch Exp $
+#	$NetBSD: Makefile,v 1.14 2005/03/21 00:49:17 rtr Exp $
 
 .include "../Makefile.common"
 
@@ -24,6 +24,10 @@ SUBDIR+=netbsd/arm32vidc
 SUBDIR+=netbsd/dec
 .endif
 
+.if ${XSERVER_XDMX} != "no"
+SUBDIR+=dmx
+.endif
+
 .if ${XSERVER_XDREAMCAST} != "no"
 SUBDIR+=netbsd/dreamcast
 .endif