diff --git a/x11/Xserver/Xserver/Xdmx/Makefile b/x11/Xserver/Xserver/Xdmx/Makefile
new file mode 100644
index 000000000000..7a54b511cbe6
--- /dev/null
+++ b/x11/Xserver/Xserver/Xdmx/Makefile
@@ -0,0 +1,60 @@
+#	$NetBSD: Makefile,v 1.1 2005/03/21 00:19:19 rtr Exp $
+
+.include <bsd.own.mk>
+
+PROG=	Xdmx
+
+.PATH:	${X11SRCDIR.xc}/programs/Xserver/hw/dmx
+
+.include "../Makefile.Xserver"
+
+LDADD+= ${LDADD.dix} \
+	${LDADD.hw/dmx} \
+	${LDADD.os} \
+	${LDADD.randr} \
+	${LDADD.hw/dmx/dmxconfig} \
+	${LDADD.miext/shadow} \
+	${LDADD.fb} \
+	${LDADD.mi} \
+	${LDADD.Xext/ext} \
+	${LDADD.record} \
+	${LDADD.xtrap} \
+	${LDADD.xkb} \
+	${LDADD.xinput} \
+	${LDADD.lbx} \
+	-llbxutil \
+	${LDADD.render} \
+	${LDADD.hw/dmx/dmxinput} \
+	-lXfont \
+	-lfreetype \
+	${LDADD.dix/xpstubs} \
+	-lXi -lXmu -lXt -lSM \
+	-lICE -lXext -lX11 \
+	-lXrender -lXext -lX11 \
+	-lz -lm -lXdmcp
+
+DPADD+= ${DPADD.dix} \
+	${DPADD.hw/dmx} \
+	${DPADD.os} \
+	${DPADD.randr} \
+	${DPADD.hw/dmx/dmxconfig} \
+	${DPADD.miext/shadow} \
+	${DPADD.fb} \
+	${DPADD.mi} \
+	${DPADD.Xext/ext} \
+	${DPADD.record} \
+	${DPADD.xtrap} \
+	${DPADD.xkb} \
+	${DPADD.xinput} \
+	${DPADD.lbx} \
+	${DPADD.render} \
+	${DPADD.hw/dmx/dmxinput} \
+	${DPADD.dix/xpstubs}
+
+.if ${MACHINE_ARCH} == "i386"
+LDADD+=	-li386
+DPADD+=	${LIBI386}
+.endif
+
+.include <bsd.x11.mk>
+.include <bsd.prog.mk>
diff --git a/x11/Xserver/Xserver/Xdmx/Xdmx.c b/x11/Xserver/Xserver/Xdmx/Xdmx.c
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/x11/Xserver/hw/dmx/Makefile b/x11/Xserver/hw/dmx/Makefile
new file mode 100644
index 000000000000..c05107ad8d6c
--- /dev/null
+++ b/x11/Xserver/hw/dmx/Makefile
@@ -0,0 +1,47 @@
+#	$NetBSD: Makefile,v 1.1 2005/03/21 00:19:19 rtr Exp $
+
+.include "../../Makefile.serverlib"
+
+LIB=		dmx
+
+.PATH:		${X11SRCDIR.xc}/programs/Xserver/hw/dmx
+SRCS=		dmxinit.c dmxscrinit.c dmxshadow.c dmxcursor.c dmxinput.c \
+		dmxdpms.c dmxgc.c dmxgcops.c dmxwindow.c dmxpixmap.c \
+		dmxfont.c dmxcmap.c dmxvisual.c dmxlog.c dmxcb.c dmxprop.c \
+		dmxstat.c dmxsync.c dmxextension.c dmxpict.c
+
+.PATH:          ${X11SRCDIR.xc}/programs/Xserver/mi
+SRCS+=		miinitext.c
+
+CPPFLAGS+=	-I${X11SRCDIR.xc}/programs/Xserver/hw/dmx \
+		-I${DESTDIR}${X11INCDIR}/X11 \
+		-I${X11SRCDIR.xc}/include/fonts \
+		-I${X11SRCDIR.xc}/programs/Xserver/mi \
+		-I${X11SRCDIR.xc}/programs/Xserver/include \
+		-I${X11SRCDIR.xc}/programs/Xserver/os \
+		-I${X11SRCDIR.xc}/programs/Xserver/fb \
+		-I${X11SRCDIR.xc}/programs/Xserver/miext/shadow \
+		-I${X11SRCDIR.xc}/programs/Xserver/render \
+		-I${DESTDIR}${X11INCDIR}/X11/extensions \
+		-I${X11SRCDIR.xc}/programs/Xserver/Xext \
+		-I${XSERVERINCDIR}
+
+CPPFLAGS+=	-DVENDOR_STRING="\"The XFree86 Project, Inc\"" \
+		-DVENDOR_RELEASE="${XVERSION}" \
+		-DOSNAME='"NetBSD/i386 2.99.16 [ELF]"' \
+		-DOSVENDOR='"The NetBSD Foundation, Inc."'
+
+CPPFLAGS+=	${X11FLAGS.OS_DEFINES} \
+		${X11FLAGS.EXTENSION} \
+		-DDMXEXT
+
+CPPFLAGS+=	-UGLXEXT -UXV -UDBE -UXF86VIDMODE -UXF86MISC -UXFreeXDGA \
+		-UMITSHM -UTOGCUP -UMITMISC -USCREENSAVER -URANDR -UFONTCACHE
+
+CPPFLAGS.miinitext.c=	-UDPMSExtension
+
+.include <bsd.x11.mk>
+XVERSION!=	${PRINTX11VERSION}
+.include <bsd.lib.mk>
+SUBDIR=	dmxinput dmxconfig
+.include <bsd.subdir.mk>
diff --git a/x11/Xserver/hw/dmx/dmxconfig/Makefile b/x11/Xserver/hw/dmx/dmxconfig/Makefile
new file mode 100644
index 000000000000..652f452bbba5
--- /dev/null
+++ b/x11/Xserver/hw/dmx/dmxconfig/Makefile
@@ -0,0 +1,25 @@
+#	$NetBSD: Makefile,v 1.1 2005/03/21 00:19:19 rtr Exp $
+
+.include "../../../Makefile.serverlib"
+
+LIB=		dmxconfig
+
+.PATH:		${X11SRCDIR.xc}/programs/Xserver/hw/dmx/config
+SRCS=		scanner.l parser.y parser.c scanner.c dmxparse.c dmxprint.c dmxcompat.c dmxconfig.c
+
+YHEADER=	# defined
+
+CPPFLAGS+=	-I${X11SRCDIR.xc}/programs/Xserver/hw/dmx/config \
+		-I${X11SRCDIR.xc}/programs/Xserver/hw/dmx \
+		-I${DESTDIR}${X11INCDIR}/X11 \
+		-I${X11SRCDIR.xc}/include/fonts \
+		-I${X11SRCDIR.xc}/programs/Xserver/mi \
+		-I${X11SRCDIR.xc}/programs/Xserver/include \
+		-I${X11SRCDIR.xc}/programs/Xserver/render \
+		-I${DESTDIR}${X11INCDIR}/X11/extensions \
+		-I. \
+		-I${XSERVERINCDIR}
+
+.include <bsd.x11.mk>
+XVERSION!=	${PRINTX11VERSION}
+.include <bsd.lib.mk>
diff --git a/x11/Xserver/hw/dmx/dmxinput/Makefile b/x11/Xserver/hw/dmx/dmxinput/Makefile
new file mode 100644
index 000000000000..c7c74ec9cefb
--- /dev/null
+++ b/x11/Xserver/hw/dmx/dmxinput/Makefile
@@ -0,0 +1,26 @@
+#	$NetBSD: Makefile,v 1.1 2005/03/21 00:19:19 rtr Exp $
+
+.include "../../../Makefile.serverlib"
+
+LIB=		dmxinput
+
+.PATH:		${X11SRCDIR.xc}/programs/Xserver/hw/dmx/input
+SRCS=		dmxdummy.c dmxbackend.c dmxconsole.c dmxcommon.c \
+		dmxinputinit.c dmxarg.c dmxsigio.c dmxevents.c \
+		dmxxinput.c dmxmotion.c dmxeq.c dmxmap.c ChkNotMaskEv.c
+
+CPPFLAGS+=	-I${X11SRCDIR.xc}/programs/Xserver/hw/dmx/input \
+		-I${X11SRCDIR.xc}/programs/Xserver/hw/dmx \
+		-I${DESTDIR}${X11INCDIR}/X11 \
+		-I${X11SRCDIR.xc}/include/fonts \
+		-I${X11SRCDIR.xc}/programs/Xserver/mi \
+		-I${X11SRCDIR.xc}/programs/Xserver/include \
+		-I${X11SRCDIR.xc}/programs/Xserver/render \
+		-I${DESTDIR}${X11INCDIR}/X11/extensions \
+		-I${X11SRCDIR.xc}/programs/Xserver/Xext \
+		-I${X11SRCDIR.xc}/programs/Xserver/Xi \
+		-I${XSERVERINCDIR}
+
+.include <bsd.x11.mk>
+XVERSION!=	${PRINTX11VERSION}
+.include <bsd.lib.mk>