diff --git a/ChangeLog b/ChangeLog
index 2c1507236..186dd123c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2005-10-05  Kevin E. Martin  <kem-at-freedesktop-dot-org>
+
+	* configure.ac:
+	* hw/dmx/Makefile.am:
+	* hw/dmx/config/Makefile.am:
+	* hw/dmx/doc/Makefile.am:
+	* hw/dmx/examples/Makefile.am:
+	* hw/dmx/input/Makefile.am:
+	Add support for building DMX config and examples programs
+	Add missing files to EXTRA_DIST
+	Install Xdmx man page
+
 2005-10-05  Kevin E. Martin  <kem-at-freedesktop-dot-org>
 
 	* hw/xfree86/fbdevhw/Makefile.am:
diff --git a/configure.ac b/configure.ac
index d4e708100..0a7df5c1b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -691,6 +691,20 @@ dnl Linux sources in DMX require <linux/keyboard.h>
 	if test "x$GLX" = xyes; then
 		PKG_CHECK_MODULES([GL], [glproto])
 	fi
+	PKG_CHECK_MODULES([XDMXCONFIG_DEP], [xaw7 xmu xt xpm x11])
+	AC_SUBST(XDMXCONFIG_DEP_LIBS)
+	PKG_CHECK_MODULES([DMXEXAMPLES_DEP], [dmx xext x11])
+	AC_SUBST(DMXEXAMPLES_DEP_LIBS)
+	PKG_CHECK_MODULES([DMXXMUEXAMPLES_DEP], [dmx xmu xext x11])
+	AC_SUBST(DMXXMUEXAMPLES_DEP_LIBS)
+	PKG_CHECK_MODULES([DMXXIEXAMPLES_DEP], [dmx xi xext x11])
+	AC_SUBST(DMXXIEXAMPLES_DEP_LIBS)
+	PKG_CHECK_MODULES([XTSTEXAMPLES_DEP], [xtst xext x11])
+	AC_SUBST(XTSTEXAMPLES_DEP_LIBS)
+	PKG_CHECK_MODULES([XRESEXAMPLES_DEP], [xres xext x11])
+	AC_SUBST(XRESEXAMPLES_DEP_LIBS)
+	PKG_CHECK_MODULES([X11EXAMPLES_DEP], [xext x11])
+	AC_SUBST(X11EXAMPLES_DEP_LIBS)
 fi
 AM_CONDITIONAL([DMX_BUILD_LNX], [test "x$DMX_BUILD_LNX" = xyes])
 AM_CONDITIONAL([DMX_BUILD_USB], [test "x$DMX_BUILD_USB" = xyes])
@@ -1196,6 +1210,7 @@ hw/xfree86/utils/xorgcfg/Makefile
 hw/xfree86/utils/xorgconfig/Makefile
 hw/dmx/config/Makefile
 hw/dmx/doc/Makefile
+hw/dmx/examples/Makefile
 hw/dmx/input/Makefile
 hw/dmx/glxProxy/Makefile
 hw/dmx/Makefile
diff --git a/hw/dmx/Makefile.am b/hw/dmx/Makefile.am
index 951489b85..07ef7c1db 100644
--- a/hw/dmx/Makefile.am
+++ b/hw/dmx/Makefile.am
@@ -1,6 +1,6 @@
-DIST_SUBDIRS = input config glxProxy doc
+DIST_SUBDIRS = input config glxProxy examples doc
 
-SUBDIRS = input config
+SUBDIRS = input config examples
 bin_PROGRAMS = Xdmx
 
 if XINERAMA
@@ -83,3 +83,5 @@ Xdmx_CFLAGS = -DHAVE_DMX_CONFIG_H \
               -DXFree86Server \
               $(GLX_INCS) \
               @DMXMODULES_CFLAGS@
+
+dist_man_MANS = Xdmx.1
diff --git a/hw/dmx/config/Makefile.am b/hw/dmx/config/Makefile.am
index a4dbbe4ae..7b3b0eebc 100644
--- a/hw/dmx/config/Makefile.am
+++ b/hw/dmx/config/Makefile.am
@@ -20,5 +20,41 @@ CLEANFILES = $(BUILT_SOURCES)
 
 libdmxconfig_a_SOURCES = $(LIBSRCS)
 
-AM_CFLAGS = -I$(top_srcdir)/hw/dmx -DHAVE_DMX_CONFIG_H @DMXMODULES_CFLAGS@
 AM_YFLAGS = -d
+AM_CFLAGS = \
+	-I$(top_srcdir)/hw/dmx \
+	-DHAVE_DMX_CONFIG_H \
+	-DDMX_LOG_STANDALONE \
+	@DMXMODULES_CFLAGS@
+
+bin_PROGRAMS = xdmxconfig vdltodmx dmxtodmx
+
+xdmxconfig_SOURCES = \
+	xdmxconfig.c \
+	$(top_srcdir)/hw/dmx/dmxlog.c \
+	Canvas.c \
+	Canvas.h \
+	CanvasP.h
+xdmxconfig_LDADD = -L. -ldmxconfig @XDMXCONFIG_DEP_LIBS@
+
+vdltodmx_SOURCES = vdltodmx.c
+vdltodmx_LDADD = -L. -ldmxconfig
+
+dmxtodmx_SOURCES = dmxtodmx.c
+dmxtodmx_LDADD = -L. -ldmxconfig
+
+dist_man1_MANS = xdmxconfig.man vdltodmx.man dmxtodmx.man
+
+EXTRA_DIST = \
+	test-a.in test-a.out \
+	test-b.in test-b.out \
+	test-c.in test-c.out \
+	test-d.in test-d.out \
+	test-e.in test-e.out \
+	test-f.in test-f.out \
+	test-g.in test-g.out \
+	test-h.in test-h.out \
+	test-i.in test-i.out \
+	test-j.in test-j.out \
+	test-k.in test-k.out \
+	test-l.in test-l.out
diff --git a/hw/dmx/doc/Makefile.am b/hw/dmx/doc/Makefile.am
index a08d005c2..888306cfe 100644
--- a/hw/dmx/doc/Makefile.am
+++ b/hw/dmx/doc/Makefile.am
@@ -49,4 +49,260 @@ noinst_DATA = $(TXT_FILES) $(PS_FILES) $(PDF_FILES) $(HTML_FILES)
 CLEANFILES = $(TXT_FILES) $(PS_FILES) $(PDF_FILES) $(HTML_FILES)
 endif
 
-EXTRA_DIST = $(SGML_FILES)
+EXTRA_DIST = \
+	$(SGML_FILES) \
+	DMXSpec.txt \
+	DMXSpec-v1.txt \
+	dmx.txt \
+	doxygen.conf \
+	doxygen.css \
+	doxygen.foot \
+	doxygen.head \
+	scaled.txt \
+	html/annotated.html \
+	html/ChkNotMaskEv_8c.html \
+	html/ChkNotMaskEv_8h.html \
+	html/ChkNotMaskEv_8h-source.html \
+	html/classes.html \
+	html/dmx_8h.html \
+	html/dmx_8h-source.html \
+	html/dmxarg_8c.html \
+	html/dmxarg_8h.html \
+	html/dmxarg_8h-source.html \
+	html/dmxbackend_8c.html \
+	html/dmxbackend_8h.html \
+	html/dmxbackend_8h-source.html \
+	html/dmxcb_8c.html \
+	html/dmxcb_8h.html \
+	html/dmxcb_8h-source.html \
+	html/dmxclient_8h.html \
+	html/dmxclient_8h-source.html \
+	html/dmxcmap_8c.html \
+	html/dmxcmap_8h.html \
+	html/dmxcmap_8h-source.html \
+	html/dmxcommon_8c.html \
+	html/dmxcommon_8h.html \
+	html/dmxcommon_8h-source.html \
+	html/dmxcompat_8c.html \
+	html/dmxcompat_8h.html \
+	html/dmxcompat_8h-source.html \
+	html/dmxconfig_8c.html \
+	html/dmxconfig_8h.html \
+	html/dmxconfig_8h-source.html \
+	html/dmxconsole_8c.html \
+	html/dmxconsole_8h.html \
+	html/dmxconsole_8h-source.html \
+	html/dmxcursor_8c.html \
+	html/dmxcursor_8h.html \
+	html/dmxcursor_8h-source.html \
+	html/dmxdetach_8c.html \
+	html/dmxdpms_8c.html \
+	html/dmxdpms_8h.html \
+	html/dmxdpms_8h-source.html \
+	html/dmxdummy_8c.html \
+	html/dmxdummy_8h.html \
+	html/dmxdummy_8h-source.html \
+	html/dmxeq_8c.html \
+	html/dmxeq_8h.html \
+	html/dmxeq_8h-source.html \
+	html/dmxevents_8c.html \
+	html/dmxevents_8h.html \
+	html/dmxevents_8h-source.html \
+	html/dmxext_8h.html \
+	html/dmxext_8h-source.html \
+	html/dmxextension_8c.html \
+	html/dmxextension_8h.html \
+	html/dmxextension_8h-source.html \
+	html/dmxfont_8c.html \
+	html/dmxfont_8h.html \
+	html/dmxfont_8h-source.html \
+	html/dmxgc_8c.html \
+	html/dmxgc_8h.html \
+	html/dmxgc_8h-source.html \
+	html/dmxgcops_8c.html \
+	html/dmxgcops_8h.html \
+	html/dmxgcops_8h-source.html \
+	html/dmx__glxvisuals_8h-source.html \
+	html/dmxinit_8c.html \
+	html/dmxinit_8h.html \
+	html/dmxinit_8h-source.html \
+	html/dmxinput_8c.html \
+	html/dmxinput_8h.html \
+	html/dmxinput_8h-source.html \
+	html/dmxinputinit_8c.html \
+	html/dmxinputinit_8h.html \
+	html/dmxinputinit_8h-source.html \
+	html/dmxlog_8c.html \
+	html/dmxlog_8h.html \
+	html/dmxlog_8h-source.html \
+	html/dmxmap_8c.html \
+	html/dmxmap_8h.html \
+	html/dmxmap_8h-source.html \
+	html/dmxmotion_8c.html \
+	html/dmxmotion_8h.html \
+	html/dmxmotion_8h-source.html \
+	html/dmxparse_8c.html \
+	html/dmxparse_8h.html \
+	html/dmxparse_8h-source.html \
+	html/dmxpict_8c.html \
+	html/dmxpict_8h.html \
+	html/dmxpict_8h-source.html \
+	html/dmxpixmap_8c.html \
+	html/dmxpixmap_8h.html \
+	html/dmxpixmap_8h-source.html \
+	html/dmxprint_8c.html \
+	html/dmxprint_8h.html \
+	html/dmxprint_8h-source.html \
+	html/dmxprop_8c.html \
+	html/dmxprop_8h.html \
+	html/dmxprop_8h-source.html \
+	html/dmxproto_8h.html \
+	html/dmxproto_8h-source.html \
+	html/dmxscrinit_8c.html \
+	html/dmxscrinit_8h.html \
+	html/dmxscrinit_8h-source.html \
+	html/dmxshadow_8c.html \
+	html/dmxshadow_8h.html \
+	html/dmxshadow_8h-source.html \
+	html/dmxsigio_8c.html \
+	html/dmxsigio_8h.html \
+	html/dmxsigio_8h-source.html \
+	html/dmxstat_8c.html \
+	html/dmxstat_8h.html \
+	html/dmxstat_8h-source.html \
+	html/dmxsync_8c.html \
+	html/dmxsync_8h.html \
+	html/dmxsync_8h-source.html \
+	html/dmxvisual_8c.html \
+	html/dmxvisual_8h.html \
+	html/dmxvisual_8h-source.html \
+	html/dmxwindow_8c.html \
+	html/dmxwindow_8h.html \
+	html/dmxwindow_8h-source.html \
+	html/dmxxinput_8c.html \
+	html/doxygen.css \
+	html/doxygen.png \
+	html/files.html \
+	html/ftv2blank.png \
+	html/ftv2doc.png \
+	html/ftv2folderclosed.png \
+	html/ftv2folderopen.png \
+	html/ftv2lastnode.png \
+	html/ftv2link.png \
+	html/ftv2mlastnode.png \
+	html/ftv2mnode.png \
+	html/ftv2node.png \
+	html/ftv2plastnode.png \
+	html/ftv2pnode.png \
+	html/ftv2vertline.png \
+	html/functions.html \
+	html/functions_vars.html \
+	html/globals_defs.html \
+	html/globals_enum.html \
+	html/globals_eval.html \
+	html/globals_func.html \
+	html/globals.html \
+	html/globals_type.html \
+	html/globals_vars.html \
+	html/index.html \
+	html/lib_2dmx_2dmx_8c.html \
+	html/lnx-keyboard_8c.html \
+	html/lnx-keyboard_8h.html \
+	html/lnx-keyboard_8h-source.html \
+	html/lnx-ms_8c.html \
+	html/lnx-ms_8h.html \
+	html/lnx-ms_8h-source.html \
+	html/lnx-ps2_8c.html \
+	html/lnx-ps2_8h.html \
+	html/lnx-ps2_8h-source.html \
+	html/main.html \
+	html/programs_2Xserver_2Xext_2dmx_8c.html \
+	html/struct__dmxArg.html \
+	html/struct__dmxColormapPriv.html \
+	html/structDMXConfigCmdStruct.html \
+	html/struct__DMXConfigComment.html \
+	html/struct__DMXConfigDisplay.html \
+	html/struct__DMXConfigEntry.html \
+	html/struct__DMXConfigFullDim.html \
+	html/structDMXConfigListStruct.html \
+	html/struct__DMXConfigNumber.html \
+	html/struct__DMXConfigOption.html \
+	html/struct__DMXConfigPair.html \
+	html/struct__DMXConfigParam.html \
+	html/struct__DMXConfigPartDim.html \
+	html/struct__DMXConfigString.html \
+	html/struct__DMXConfigSub.html \
+	html/struct__DMXConfigToken.html \
+	html/struct__DMXConfigVirtual.html \
+	html/struct__DMXConfigWall.html \
+	html/struct__dmxCursorPriv.html \
+	html/structDMXDesktopAttributes.html \
+	html/structDMXDesktopAttributesRec.html \
+	html/struct__DMXEventMap.html \
+	html/struct__dmxFontPriv.html \
+	html/struct__dmxGCPriv.html \
+	html/structdmxGlxVisualPrivate.html \
+	html/struct__dmxGlyphPriv.html \
+	html/structDMXInputAttributes.html \
+	html/structDMXInputAttributesRec.html \
+	html/struct__DMXInputInfo.html \
+	html/struct__DMXLocalInitInfo.html \
+	html/struct__DMXLocalInputInfo.html \
+	html/struct__dmxPictPriv.html \
+	html/struct__dmxPixPriv.html \
+	html/structDMXScreenAttributes.html \
+	html/structDMXScreenAttributesRec.html \
+	html/struct__DMXScreenInfo.html \
+	html/struct__DMXStatAvg.html \
+	html/struct__DMXStatInfo.html \
+	html/structDMXWindowAttributes.html \
+	html/structDMXWindowAttributesRec.html \
+	html/struct__dmxWinPriv.html \
+	html/struct__Event.html \
+	html/struct__EventQueue.html \
+	html/struct__myPrivate.html \
+	html/structxDMXAddInputReply.html \
+	html/structxDMXAddInputReq.html \
+	html/structxDMXAddScreenReply.html \
+	html/structxDMXAddScreenReq.html \
+	html/structxDMXChangeDesktopAttributesReply.html \
+	html/structxDMXChangeDesktopAttributesReq.html \
+	html/structxDMXChangeScreensAttributesReply.html \
+	html/structxDMXChangeScreensAttributesReq.html \
+	html/structxDMXForceWindowCreationReply.html \
+	html/structxDMXForceWindowCreationReq.html \
+	html/structxDMXGetDesktopAttributesReply.html \
+	html/structxDMXGetDesktopAttributesReq.html \
+	html/structxDMXGetInputAttributesReply.html \
+	html/structxDMXGetInputAttributesReq.html \
+	html/structxDMXGetInputCountReply.html \
+	html/structxDMXGetInputCountReq.html \
+	html/structxDMXGetScreenAttributesReply.html \
+	html/structxDMXGetScreenAttributesReq.html \
+	html/structxDMXGetScreenCountReply.html \
+	html/structxDMXGetScreenCountReq.html \
+	html/structxDMXGetWindowAttributesReply.html \
+	html/structxDMXGetWindowAttributesReq.html \
+	html/structxDMXQueryVersionReply.html \
+	html/structxDMXQueryVersionReq.html \
+	html/structxDMXRemoveInputReply.html \
+	html/structxDMXRemoveInputReq.html \
+	html/structxDMXRemoveScreenReply.html \
+	html/structxDMXRemoveScreenReq.html \
+	html/structxDMXSyncReply.html \
+	html/structxDMXSyncReq.html \
+	html/tree.html \
+	html/usb-common_8c.html \
+	html/usb-common_8h.html \
+	html/usb-common_8h-source.html \
+	html/usb-keyboard_8c.html \
+	html/usb-keyboard_8h.html \
+	html/usb-keyboard_8h-source.html \
+	html/usb-mouse_8c.html \
+	html/usb-mouse_8h.html \
+	html/usb-mouse_8h-source.html \
+	html/usb-other_8c.html \
+	html/usb-other_8h.html \
+	html/usb-other_8h-source.html \
+	html/usb-private_8h.html \
+	html/usb-private_8h-source.html
diff --git a/hw/dmx/examples/Makefile.am b/hw/dmx/examples/Makefile.am
new file mode 100644
index 000000000..14359bc69
--- /dev/null
+++ b/hw/dmx/examples/Makefile.am
@@ -0,0 +1,50 @@
+bin_PROGRAMS = \
+	xdmx dmxwininfo dmxreconfig dmxresize \
+	dmxaddscreen dmxrmscreen \
+	dmxaddinput dmxrminput
+noinst_PROGRAMS = xinput xtest evi res xled xbell ev
+
+xdmx_SOURCES = xdmx.c
+xdmx_LDADD = @DMXEXAMPLES_DEP_LIBS@
+
+dmxwininfo_SOURCES = dmxwininfo.c
+dmxwininfo_LDADD = @DMXXMUEXAMPLES_DEP_LIBS@
+
+dmxreconfig_SOURCES = dmxreconfig.c
+dmxreconfig_LDADD = @DMXEXAMPLES_DEP_LIBS@
+
+dmxresize_SOURCES = dmxresize.c
+dmxresize_LDADD = @DMXEXAMPLES_DEP_LIBS@
+
+dmxaddscreen_SOURCES = dmxaddscreen.c
+dmxaddscreen_LDADD = @DMXEXAMPLES_DEP_LIBS@
+
+dmxrmscreen_SOURCES = dmxrmscreen.c
+dmxrmscreen_LDADD = @DMXEXAMPLES_DEP_LIBS@
+
+dmxaddinput_SOURCES = dmxaddinput.c
+dmxaddinput_LDADD = @DMXEXAMPLES_DEP_LIBS@
+
+dmxrminput_SOURCES = dmxrminput.c
+dmxrminput_LDADD = @DMXEXAMPLES_DEP_LIBS@
+
+xinput_SOURCES = xinput.c
+xinput_LDADD = @DMXXIEXAMPLES_DEP_LIBS@
+
+xtest_SOURCES = xtest.c
+xtest_LDADD = @XTSTEXAMPLES_DEP_LIBS@
+
+evi_SOURCES = evi.c
+evi_LDADD = @X11EXAMPLES_DEP_LIBS@
+
+res_SOURCES = res.c
+res_LDADD = @XRESEXAMPLES_DEP_LIBS@
+
+xled_SOURCES = xled.c
+xled_LDADD = @X11EXAMPLES_DEP_LIBS@
+
+xbell_SOURCES = xbell.c
+xbell_LDADD = @X11EXAMPLES_DEP_LIBS@
+
+ev_SOURCES = ev.c
+ev_LDADD = 
diff --git a/hw/dmx/input/Makefile.am b/hw/dmx/input/Makefile.am
index 1db9872fc..5edf79dcc 100644
--- a/hw/dmx/input/Makefile.am
+++ b/hw/dmx/input/Makefile.am
@@ -59,3 +59,5 @@ AM_CFLAGS = -I$(top_srcdir)/hw/dmx \
             -I$(top_srcdir)/hw/xfree86/common \
             -DHAVE_DMX_CONFIG_H \
             @DMXMODULES_CFLAGS@
+
+EXTRA_DIST = dmxdetach.c