diff --git a/ChangeLog b/ChangeLog
index 9d96992d6..263fc02f3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-10-05  Adam Jackson  <ajax@freedesktop.org>
+
+	* configure.ac:
+	* hw/xfree86/utils/xorgcfg/Makefile.am:
+	Preprocess and install XOrgCfg.ad as in the monolith.
+
 2005-10-04  Adam Jackson  <ajax@freedesktop.org>
 
 	* configure.ac:
diff --git a/hw/xfree86/utils/xorgcfg/Makefile.am b/hw/xfree86/utils/xorgcfg/Makefile.am
index af7b527b7..af2136a79 100644
--- a/hw/xfree86/utils/xorgcfg/Makefile.am
+++ b/hw/xfree86/utils/xorgcfg/Makefile.am
@@ -113,10 +113,14 @@ XPM_DATA = \
 
 appdefaultdir = $(sysconfdir)/X11/app-defaults
 
-APPDEFAULTFILES = XOrgCfg
+APPDEFAULTFILES = XOrgCfg.ad
 
 appdefault_DATA = $(APPDEFAULTFILES)
 
+XOrgCfg.ad: XOrgCfg.pre
+	$(RAWCPP) $(RAWCPPFLAGS) -D__VENDORNAME__="@VENDOR_STRING@" \
+               -D__VENDORVERS__="@VENDOR_RELEASE@" -o $@ $<
+
 # Man page
 man1_MANS =  xorgcfg.man