diff --git a/ChangeLog b/ChangeLog
index 2b16c60af..96a60ad39 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-11-03  Alan Coopersmith  <alan.coopersmith@sun.com>
+
+	* doc/Makefile.am: 
+	Use APP_MAN_SUFFIX for Xserver man page instead of hardcoding section 1
+	
 2005-11-02  Kevin E. Martin  <kem-at-freedesktop-dot-org>
 
 	* configure.ac:
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 94cc964a8..88a1b9dca 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,18 +1,25 @@
+appmandir =  $(mandir)/man$(APP_MAN_SUFFIX)
+
 # Xserver.man covers options generic to all X servers built in this tree
-MAN_SRCS = Xserver.man.pre
+appman_SOURCES = Xserver.man.pre
 
-man1_MANS = Xserver.man
+appman_PROCESSED = $(appman_SOURCES:man.pre=man)
 
-all-local: $(man1_MANS)
+appman_DATA = $(appman_SOURCES:man.pre=@APP_MAN_SUFFIX@)
 
-CLEANFILES = $(man1_MANS)
+BUILT_SOURCES = $(appman_PROCESSED)
+
+CLEANFILES = $(appman_PROCESSED) $(appman_DATA)
 
 include $(top_srcdir)/cpprules.in
 
+.man.$(APP_MAN_SUFFIX):
+	cp $< $@
+
 EXTRAMANDEFS = -D__default_font_path__="`echo $(COMPILEDDEFAULTFONTPATH) | sed -e 's/,/, /g'`"
 
 # Docs about X server internals that we ship with source but don't install
 DEVEL_DOCS = smartsched
 
 
-EXTRA_DIST = $(DEVEL_DOCS) $(MAN_SRCS)
\ No newline at end of file
+EXTRA_DIST = $(DEVEL_DOCS) $(appman_SOURCES)