diff --git a/ChangeLog b/ChangeLog
index 1ce2a1fd5..d5dd08d6b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2005-12-08  Kevin E. Martin  <kem-at-freedesktop-dot-org>
+
+	* configure.ac:
+	* hw/xfree86/Makefile.am:
+	* hw/xfree86/utils/xorgcfg/Makefile.am:
+	* hw/xfree86/utils/xorgconfig/Makefile.am:
+	Add configure options to allow hard-coded paths to be changed.
+
 2005-12-07  Kevin E. Martin  <kem-at-freedesktop-dot-org>
 
 	* configure.ac:
diff --git a/configure.ac b/configure.ac
index 7f381d93e..073bf8082 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1291,8 +1291,8 @@ if test x$XORGCFG = xyes ; then
 	AC_SUBST(XORGCFG_DEP_CFLAGS)
 	AC_SUBST(XORGCFG_DEP_LIBS)
 
-	appdefaultdir=$(pkg-config --variable=appdefaultdir xt)
-	AC_SUBST(appdefaultdir)
+	APPDEFAULTDIR=$(pkg-config --variable=appdefaultdir xt)
+	AC_SUBST(APPDEFAULTDIR)
 fi
 AM_CONDITIONAL(BUILD_XORGCFG, [test x$XORGCFG = xyes])
 AM_CONDITIONAL(USE_CURSES, [test x$CURSES = xyes])
diff --git a/hw/xfree86/Makefile.am b/hw/xfree86/Makefile.am
index 058015095..85a213090 100644
--- a/hw/xfree86/Makefile.am
+++ b/hw/xfree86/Makefile.am
@@ -72,4 +72,7 @@ if INSTALL_SETUID
 	chmod u+s $(DESTDIR)$(bindir)/Xorg
 endif
 
-EXTRA_DIST = xorgconf.cpp Options
+optionsdir = $(libdir)/X11
+dist_options_DATA = Options
+
+EXTRA_DIST = xorgconf.cpp
diff --git a/hw/xfree86/utils/xorgcfg/Makefile.am b/hw/xfree86/utils/xorgcfg/Makefile.am
index 2bc812a49..d2933eeff 100644
--- a/hw/xfree86/utils/xorgcfg/Makefile.am
+++ b/hw/xfree86/utils/xorgcfg/Makefile.am
@@ -31,8 +31,11 @@ bin_PROGRAMS = xorgcfg
 
 INCLUDES = $(XORG_INCS) -I$(top_srcdir)/hw/xfree86/parser
 
+OPTIONSPATH=$(libdir)/X11
+
 xorgcfg_CFLAGS = @SERVER_DEFINES@ $(XORG_CFLAGS) $(CURSESDEFINES) \
-	$(XORGCFG_DEP_CFLAGS)
+	$(XORGCFG_DEP_CFLAGS) -DXKB_RULES_DIR=\"$(XKB_BASE_DIRECTORY)/rules\" \
+	-DPROJECT_ROOT=\"$(PROJECTROOT)\" -DOPTIONSPATH=\"$(OPTIONSPATH)\"
 xorgcfg_LDADD = $(XORGCFG_DEP_LIBS) ../../parser/libxf86config.a $(LOADERLIB) \
 	../../os-support/libxorgos.la ../../dummylib/libdummy-nonserver.a
 
@@ -120,7 +123,7 @@ include $(top_srcdir)/cpprules.in
 
 # App default files  (*.ad)
 
-appdefaultdir = @appdefaultdir@
+appdefaultdir = @APPDEFAULTDIR@
 
 APPDEFAULTFILES = XOrgCfg
 
diff --git a/hw/xfree86/utils/xorgconfig/Makefile.am b/hw/xfree86/utils/xorgconfig/Makefile.am
index 4f3d62049..ec0b01fe1 100644
--- a/hw/xfree86/utils/xorgconfig/Makefile.am
+++ b/hw/xfree86/utils/xorgconfig/Makefile.am
@@ -33,7 +33,7 @@ dist_X11_DATA = Cards
 
 xorgconfig_CFLAGS = @SERVER_DEFINES@ @XORGCONFIG_DEP_CFLAGS@ \
 	-DCARD_DATABASE_FILE='"$(X11dir)/Cards"' \
-	-DPROJECTROOT='"$(prefix)"' \
+	-DPROJECTROOT='"$(PROJECTROOT)"' \
         -DFILEMANSUFFIX='"$(FILE_MAN_SUFFIX)"' \
         -DXVERSIONSTRING='"$(PACKAGE_STRING)"'