diff --git a/configure.ac b/configure.ac
index 45756ed70..41d6e6605 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2239,11 +2239,13 @@ hw/xfree86/utils/man/Makefile
 hw/xfree86/utils/cvt/Makefile
 hw/xfree86/utils/gtf/Makefile
 hw/dmx/config/Makefile
+hw/dmx/config/man/Makefile
 hw/dmx/doc/Makefile
 hw/dmx/examples/Makefile
 hw/dmx/input/Makefile
 hw/dmx/glxProxy/Makefile
 hw/dmx/Makefile
+hw/dmx/man/Makefile
 hw/vfb/Makefile
 hw/vfb/man/Makefile
 hw/xnest/Makefile
diff --git a/hw/dmx/Makefile.am b/hw/dmx/Makefile.am
index 2a87c3966..e0b201b82 100644
--- a/hw/dmx/Makefile.am
+++ b/hw/dmx/Makefile.am
@@ -1,5 +1,5 @@
 
-SUBDIRS = input config examples doc
+SUBDIRS = input config examples doc man
 bin_PROGRAMS = Xdmx
 
 if XINERAMA
@@ -85,28 +85,5 @@ Xdmx_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG)
 Xdmx_DEPENDENCIES= $(XDMX_LIBS)
 Xdmx_LDADD = $(XDMX_LIBS) $(XDMX_SYS_LIBS) $(XSERVER_SYS_LIBS)
 
-# Man page
-appmandir = $(APP_MAN_DIR)
-
-appman_PRE = Xdmx.man
-appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
-
-CLEANFILES = $(appman_DATA)
-
-# Strings to replace in man pages
-XORGRELSTRING = @PACKAGE_STRING@
-  XORGMANNAME = X Version 11
-
-MAN_SUBSTS = \
-	-e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
-	-e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g'
-
-SUFFIXES = .$(APP_MAN_SUFFIX) .man
-
-.man.$(APP_MAN_SUFFIX):
-	$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
-
-EXTRA_DIST = $(appman_PRE)
-
 relink:
 	$(AM_V_at)rm -f Xdmx$(EXEEXT) && $(MAKE) Xdmx$(EXEEXT)
diff --git a/hw/dmx/config/Makefile.am b/hw/dmx/config/Makefile.am
index 25a814e79..de4ce315d 100644
--- a/hw/dmx/config/Makefile.am
+++ b/hw/dmx/config/Makefile.am
@@ -1,3 +1,5 @@
+SUBDIRS = man
+
 noinst_LIBRARIES = libdmxconfig.a
 
 LIBSRCS = parser.y \
@@ -53,26 +55,7 @@ dmxtodmx_DEPENDENCIES = libdmxconfig.a
 dmxtodmx_SOURCES = dmxtodmx.c
 dmxtodmx_LDADD = -L. -ldmxconfig
 
-appmandir = $(APP_MAN_DIR)
-
-appman_PRE = xdmxconfig.man vdltodmx.man dmxtodmx.man
-appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
-
-CLEANFILES = $(appman_DATA)
-
-SUFFIXES = .$(APP_MAN_SUFFIX) .man
-
-# Strings to replace in man pages
-XORGRELSTRING = @PACKAGE_STRING@
-  XORGMANNAME = X Version 11
-
-MAN_SUBSTS = -e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' 
-
-.man.$(APP_MAN_SUFFIX):
-	$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
-
 EXTRA_DIST = \
-	$(appman_PRE) \
 	test-a.in test-a.out \
 	test-b.in test-b.out \
 	test-c.in test-c.out \
diff --git a/hw/dmx/config/man/Makefile.am b/hw/dmx/config/man/Makefile.am
new file mode 100644
index 000000000..c12c78f87
--- /dev/null
+++ b/hw/dmx/config/man/Makefile.am
@@ -0,0 +1,10 @@
+appmandir = $(APP_MAN_DIR)
+appman_PRE = xdmxconfig.man vdltodmx.man dmxtodmx.man
+appman_DATA = $(appman_PRE:man=$(APP_MAN_SUFFIX))
+
+EXTRA_DIST = $(appman_PRE)
+CLEANFILES = $(appman_DATA)
+SUFFIXES = .$(APP_MAN_SUFFIX) .man
+
+.man.$(APP_MAN_SUFFIX):
+	$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
diff --git a/hw/dmx/config/dmxtodmx.man b/hw/dmx/config/man/dmxtodmx.man
similarity index 100%
rename from hw/dmx/config/dmxtodmx.man
rename to hw/dmx/config/man/dmxtodmx.man
diff --git a/hw/dmx/config/vdltodmx.man b/hw/dmx/config/man/vdltodmx.man
similarity index 100%
rename from hw/dmx/config/vdltodmx.man
rename to hw/dmx/config/man/vdltodmx.man
diff --git a/hw/dmx/config/xdmxconfig.man b/hw/dmx/config/man/xdmxconfig.man
similarity index 100%
rename from hw/dmx/config/xdmxconfig.man
rename to hw/dmx/config/man/xdmxconfig.man
diff --git a/hw/dmx/man/Makefile.am b/hw/dmx/man/Makefile.am
new file mode 100644
index 000000000..a0522ae84
--- /dev/null
+++ b/hw/dmx/man/Makefile.am
@@ -0,0 +1,10 @@
+appmandir = $(APP_MAN_DIR)
+appman_PRE = Xdmx.man
+appman_DATA = $(appman_PRE:man=$(APP_MAN_SUFFIX))
+
+EXTRA_DIST = $(appman_PRE)
+CLEANFILES = $(appman_DATA)
+SUFFIXES = .$(APP_MAN_SUFFIX) .man
+
+.man.$(APP_MAN_SUFFIX):
+	$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
diff --git a/hw/dmx/Xdmx.man b/hw/dmx/man/Xdmx.man
similarity index 100%
rename from hw/dmx/Xdmx.man
rename to hw/dmx/man/Xdmx.man