diff --git a/configure.ac b/configure.ac
index a482a730b..20aad237b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2233,6 +2233,7 @@ hw/xfree86/vgahw/Makefile
 hw/xfree86/x86emu/Makefile
 hw/xfree86/xaa/Makefile
 hw/xfree86/utils/Makefile
+hw/xfree86/utils/man/Makefile
 hw/xfree86/utils/cvt/Makefile
 hw/xfree86/utils/gtf/Makefile
 hw/dmx/config/Makefile
diff --git a/hw/xfree86/utils/Makefile.am b/hw/xfree86/utils/Makefile.am
index d27861b03..71f979048 100644
--- a/hw/xfree86/utils/Makefile.am
+++ b/hw/xfree86/utils/Makefile.am
@@ -1,3 +1,4 @@
 SUBDIRS = \
 	gtf \
-	cvt
+	cvt \
+	man
diff --git a/hw/xfree86/utils/cvt/.gitignore b/hw/xfree86/utils/cvt/.gitignore
index 7816fd7c6..a217c5563 100644
--- a/hw/xfree86/utils/cvt/.gitignore
+++ b/hw/xfree86/utils/cvt/.gitignore
@@ -1,3 +1 @@
-#		Add & Override for this directory and it's subdirectories
 cvt
-cvt.man
diff --git a/hw/xfree86/utils/cvt/Makefile.am b/hw/xfree86/utils/cvt/Makefile.am
index ba02145b7..4ebcedf39 100644
--- a/hw/xfree86/utils/cvt/Makefile.am
+++ b/hw/xfree86/utils/cvt/Makefile.am
@@ -32,11 +32,3 @@ cvt_SOURCES = cvt.c \
 	$(top_srcdir)/os/xprintf.c
 
 cvt_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS)
-
-man1_MANS = cvt.man
-
-CLEANFILES = $(man1_MANS)
-
-include $(top_srcdir)/cpprules.in
-
-EXTRA_DIST = cvt.man.pre
diff --git a/hw/xfree86/utils/gtf/.gitignore b/hw/xfree86/utils/gtf/.gitignore
index 9aebbbb60..919c993fb 100644
--- a/hw/xfree86/utils/gtf/.gitignore
+++ b/hw/xfree86/utils/gtf/.gitignore
@@ -1,3 +1 @@
-#		Add & Override for this directory and it's subdirectories
 gtf
-gtf.man
diff --git a/hw/xfree86/utils/gtf/Makefile.am b/hw/xfree86/utils/gtf/Makefile.am
index ea1c5fb8c..f77bf608e 100644
--- a/hw/xfree86/utils/gtf/Makefile.am
+++ b/hw/xfree86/utils/gtf/Makefile.am
@@ -25,20 +25,3 @@ bin_PROGRAMS = gtf
 gtf_SOURCES = gtf.c
 gtf_CFLAGS = $(XORG_CFLAGS)
 gtf_LDADD = -lm
-
-appmandir = $(APP_MAN_DIR)
-
-appman_PRE = gtf.man
-appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
-
-include $(top_srcdir)/cpprules.in
-
-EXTRA_DIST = gtf.man.pre
-BUILT_SOURCES = $(appman_PRE)
-CLEANFILES = $(appman_PRE) $(appman_DATA)
-
-SUFFIXES += .$(APP_MAN_SUFFIX) .man
-
-.man.$(APP_MAN_SUFFIX):
-	-$(AM_V_at)rm -f $@
-	$(AM_V_at)$(LN_S) $< $@
diff --git a/hw/xfree86/utils/man/Makefile.am b/hw/xfree86/utils/man/Makefile.am
new file mode 100644
index 000000000..fd2af8ed6
--- /dev/null
+++ b/hw/xfree86/utils/man/Makefile.am
@@ -0,0 +1,10 @@
+appmandir = $(APP_MAN_DIR)
+appman_PRE = cvt.man gtf.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/xfree86/utils/cvt/cvt.man.pre b/hw/xfree86/utils/man/cvt.man
similarity index 99%
rename from hw/xfree86/utils/cvt/cvt.man.pre
rename to hw/xfree86/utils/man/cvt.man
index 8a292eed8..b380171ee 100644
--- a/hw/xfree86/utils/cvt/cvt.man.pre
+++ b/hw/xfree86/utils/man/cvt.man
@@ -13,7 +13,7 @@ cvt - calculate VESA CVT mode lines
 .I Cvt
 is a utility for calculating VESA Coordinated Video Timing modes.  Given the
 desired horizontal and vertical resolutions, a modeline adhering to the CVT
-standard is printed. This modeline can be included in __xservername__ 
+standard is printed. This modeline can be included in __xservername__
 .B __xconfigfile__(__filemansuffix__)
 .
 
diff --git a/hw/xfree86/utils/gtf/gtf.man.pre b/hw/xfree86/utils/man/gtf.man
similarity index 100%
rename from hw/xfree86/utils/gtf/gtf.man.pre
rename to hw/xfree86/utils/man/gtf.man