diff --git a/hw/xquartz/doc/Makefile.am b/hw/xquartz/doc/Makefile.am
index 6c68c845e..287dc7aab 100644
--- a/hw/xquartz/doc/Makefile.am
+++ b/hw/xquartz/doc/Makefile.am
@@ -1,16 +1,13 @@
 appmandir = $(APP_MAN_DIR)
-appman_PRE = Xquartz.man.pre
-appman_PROCESSED = $(appman_PRE:man.pre=man)
-appman_DATA = $(appman_PRE:man.pre=@APP_MAN_SUFFIX@)
+appman_PRE = Xquartz.man
+appman_DATA = $(appman_PRE:man=$(APP_MAN_SUFFIX))
 
-CLEANFILES = $(appman_PROCESSED) $(appman_DATA)
+EXTRA_DIST = $(appman_PRE)
+CLEANFILES = $(appman_DATA)
+SUFFIXES = .$(APP_MAN_SUFFIX) .man
 
-include $(top_srcdir)/cpprules.in
-
-MANDEFS += -D__laucnd_id_prefix__=$(LAUNCHD_ID_PREFIX)
+# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
+MAN_SUBSTS += 	-e 's|__laucnd_id_prefix__|$(LAUNCHD_ID_PREFIX)|g'
 
 .man.$(APP_MAN_SUFFIX):
-	$(AM_V_at)cp $< $@
-
-EXTRA_DIST = \
-	Xquartz.man.pre
+	$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
diff --git a/hw/xquartz/doc/Xquartz.man.pre b/hw/xquartz/doc/Xquartz.man
similarity index 100%
rename from hw/xquartz/doc/Xquartz.man.pre
rename to hw/xquartz/doc/Xquartz.man