diff --git a/ChangeLog b/ChangeLog
index 317950d07..300c48c66 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-10-13  Alan Coopersmith  <alan.coopersmith@sun.com>
+
+	* hw/xfree86/utils/xorgconfig/Makefile.am (EXTRAMANDEFS): 
+	Set substitutions needed in xorgconfig man page.
+
 2005-10-13  Kristian Høgsberg  <krh@redhat.com>
 
 	* hw/xfree86/xf4bpp/Makefile.am (libxf4bpp_la_SOURCES): Dist NOTES.
diff --git a/hw/xfree86/utils/xorgconfig/Makefile.am b/hw/xfree86/utils/xorgconfig/Makefile.am
index 547600208..3693ea9ff 100644
--- a/hw/xfree86/utils/xorgconfig/Makefile.am
+++ b/hw/xfree86/utils/xorgconfig/Makefile.am
@@ -49,6 +49,10 @@ include $(top_srcdir)/cpprules.in
 
 man1_MANS = xorgconfig.man
 
+EXTRAMANDEFS = \
+	-D__XCONFIGFILE__=$(__XCONFIGFILE__) \
+	-D__XSERVERNAME__=$(XSERVERNAME)
+
 CLEANFILES = $(man1_MANS)
 
 EXTRA_DIST = \