diff --git a/configure.ac b/configure.ac
index f9024b7a3c1c531c16f7522a60094e521360f496..79da4ff0601a6915764c4d42df6369d6a0f699d6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -27,10 +27,10 @@ AC_INIT(libdmx, 1.1.0, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 AM_MAINTAINER_MODE
 
-# Require xorg-macros: XORG_DEFAULT_OPTIONS
+# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
 m4_ifndef([XORG_MACROS_VERSION],
-          [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])])
-XORG_MACROS_VERSION(1.3)
+          [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.8)
 XORG_DEFAULT_OPTIONS
 AM_CONFIG_HEADER(config.h)
 
diff --git a/man/Makefile.am b/man/Makefile.am
index e36d73aeb625ebeefe6bd2625d56fadc6d0ce980..c1027c00265554bd17c26f0d5acf41f950a1b44f 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -46,17 +46,7 @@ EXTRA_DIST = $(libman_PRE)
 
 CLEANFILES = $(libman_DATA)
 
-SED = sed
-
-# Strings to replace in man pages
-XORGRELSTRING = @PACKAGE_STRING@
-  XORGMANNAME = X Version 11
-
-MAN_SUBSTS = \
-	-e 's/__vendorversion__/"$(XORGRELSTRING)" "$(XORGMANNAME)"/' \
-	-e 's/__libmansuffix__/$(LIB_MAN_SUFFIX)/g' 
-
 SUFFIXES = .$(LIB_MAN_SUFFIX) .man
 
 .man.$(LIB_MAN_SUFFIX):
-	sed $(MAN_SUBSTS) < $< > $@
+	$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@