diff -uNr fontconfig-2.8.0.orig/conf.d/Makefile.am fontconfig-2.8.0/conf.d/Makefile.am
--- fontconfig-2.8.0.orig/conf.d/Makefile.am	2010-07-31 16:06:39.804956498 +0200
+++ fontconfig-2.8.0/conf.d/Makefile.am	2010-08-01 14:52:30.064734776 +0200
@@ -71,25 +71,25 @@
 
 EXTRA_DIST = $(CONF_FILES) $(DOC_FILES)
 
-configdir=$(CONFDIR)
-confavaildir=$(configdir)/conf.avail
-confddir=$(configdir)/conf.d
+masterconfdir=$(MASTERCONFDIR)
+templatedir=$(TEMPLATEDIR)
+confdir=$(CONFDIR)
 
-confavail_DATA=$(CONF_FILES)
-confd_DATA=$(DOC_FILES)
+template_DATA=$(CONF_FILES)
+conf_DATA=$(DOC_FILES)
 
 install-data-local:
-	mkdir -p ${DESTDIR}${confddir}
-	@(echo cd ${DESTDIR}${confddir}; \
-	 cd ${DESTDIR}${confddir}; \
+	mkdir -p ${DESTDIR}${confdir}
+	@(echo cd ${DESTDIR}${confdir}; \
+	 cd ${DESTDIR}${confdir}; \
 	 for i in ${CONF_LINKS}; do \
 	 	rm -f $$i; \
-		echo rm -f $$i";" ln -s ../conf.avail/$$i .; \
-		ln -s ../conf.avail/$$i .; \
+		echo rm -f $$i";" ln -s ${templatedir}/$$i .; \
+		ln -s ${templatedir}/$$i .; \
 	 done)
 uninstall-local:
-	@(echo cd ${DESTDIR}${confddir}; \
-	 cd ${DESTDIR}${confddir}; \
+	@(echo cd ${DESTDIR}${confdir}; \
+	 cd ${DESTDIR}${confdir}; \
 	 for i in ${CONF_LINKS}; do \
 		echo rm -f $$i; \
 		rm -f $$i; \
diff -uNr fontconfig-2.8.0.orig/config/Makedefs.in fontconfig-2.8.0/config/Makedefs.in
--- fontconfig-2.8.0.orig/config/Makedefs.in	2010-07-31 16:06:39.804956498 +0200
+++ fontconfig-2.8.0/config/Makedefs.in	2010-08-01 14:52:30.085732796 +0200
@@ -32,7 +32,10 @@
 datadir=@datadir@
 includedir=@includedir@
 sysconfdir=@sysconfdir@
+templatedir=@templatedir@
 confdir=@confdir@
+masterconfdir=@masterconfdir@
+
 
 DSO_LDOPTS=@DSO_LDOPTS@
 DSO_CFLAGS=@DSO_CFLAGS@
@@ -50,13 +53,16 @@
 # programs
 BINDIR=$(bindir)
 # font configuration files
+TEMPLATEDIR=@TEMPLATEDIR@
 CONFDIR=@CONFDIR@
+MASTERCONFDIR=@MASTERCONFDIR@
+XMLDIR=@XMLDIR@
 # include files
 INCLUDEDIR=$(includedir)/fontconfig
 
 X_FONT_DIR=@X_FONT_DIR@
 FC_DEFAULT_FONTS=@FC_DEFAULT_FONTS@
-FCPATH_DEF=-DFONTCONFIG_PATH=\"$(CONFDIR)\"
+FCPATH_DEF=-DFONTCONFIG_PATH=\"$(MASTERCONFDIR)\"
 
 CDEBUGFLAGS=@CFLAGS@
 
diff -uNr fontconfig-2.8.0.orig/configure.in fontconfig-2.8.0/configure.in
--- fontconfig-2.8.0.orig/configure.in	2010-07-31 16:06:39.806956308 +0200
+++ fontconfig-2.8.0/configure.in	2010-08-01 15:15:24.058057855 +0200
@@ -469,24 +469,63 @@
 
 AC_SUBST(FC_FONTDATE)
 
-AC_ARG_WITH(confdir,           [  --with-confdir=DIR            Use DIR to store configuration files (default SYSCONFDIR/fonts)], confdir="$withval", confdir=yes)
-
 #
-# Set CONFDIR and FONTCONFIG_PATH
+# Set Configuration paths
 #
 
+AC_ARG_WITH(templatedir,       [  --with-templatedir=DIR	Use DIR to store configuration template files  (default DATADIR/fontconfig/conf.avail)], templatedir="$withval", templatedir=yes)
+AC_ARG_WITH(confdir,           [  --with-confdir=DIR            Use DIR to store active configuration files    (default SYSCONFDIR/fonts/conf.d)], confdir="$withval", confdir=yes)
+AC_ARG_WITH(masterconfdir,     [  --with-masterconfdir=DIR      Use DIR to store the master configuration file (default SYSCONFDIR/fonts)], masterconfdir="$withval", masterconfdir=yes)
+AC_ARG_WITH(xmldir,            [  --with-xmldir=DIR             Use DIR to store XML schema files              (default DATADIR/xml/fontconfig)], xmldir="$withval", xmldir=yes)
+
+case "$templatedir" in
+no|yes)
+        templatedir='${datadir}'/fontconfig/conf.avail
+        ;;
+*)
+        ;;
+esac
+AC_SUBST(templatedir)
+TEMPLATEDIR=${templatedir}
+AC_DEFINE_UNQUOTED(TEMPLATEDIR, "$TEMPLATEDIR",[Font configuration, configuration template directory])
+AC_SUBST(TEMPLATEDIR)
+
 case "$confdir" in
 no|yes)
-	confdir='${sysconfdir}'/fonts
+	confdir='${sysconfdir}'/fonts/conf.d
 	;;
 *)
 	;;
 esac
 AC_SUBST(confdir)
 CONFDIR=${confdir}
-AC_DEFINE_UNQUOTED(CONFDIR, "$CONFDIR",[Font configuration directory])
+AC_DEFINE_UNQUOTED(CONFDIR, "$CONFDIR",[Font configuration, active configuration directory])
 AC_SUBST(CONFDIR)
 
+case "$masterconfdir" in
+no|yes)
+	masterconfdir='${sysconfdir}'/fonts
+	;;
+*)
+	;;
+esac
+AC_SUBST(masterconfdir)
+MASTERCONFDIR=${masterconfdir}
+AC_DEFINE_UNQUOTED(MASTERCONFDIR, "$MASTERCONFDIR",[Font configuration, master configuration directory])
+AC_SUBST(MASTERCONFDIR)
+
+case "$xmldir" in
+no|yes)
+	xmldir='${datadir}'/xml/fontconfig
+	;;
+*)
+	;;
+esac
+AC_SUBST(xmldir)
+XMLDIR=${xmldir}
+AC_DEFINE_UNQUOTED(XMLDIR, "$XMLDIR",[Font configuration, XML schema files])
+AC_SUBST(XMLDIR)
+
 #
 # Let people not build/install docs if they don't have docbook
 #
diff -uNr fontconfig-2.8.0.orig/Makefile.am fontconfig-2.8.0/Makefile.am
--- fontconfig-2.8.0.orig/Makefile.am	2010-07-31 16:06:39.801956781 +0200
+++ fontconfig-2.8.0/Makefile.am	2010-08-01 14:52:30.087732608 +0200
@@ -53,8 +53,12 @@
 pkgconfigdir=$(libdir)/pkgconfig
 pkgconfig_DATA = fontconfig.pc
 
-configdir=$(CONFDIR)
-config_DATA=fonts.dtd
+masterconfdir=$(MASTERCONFDIR)
+confdir=$(CONFDIR)
+templatedir=$(TEMPLATEDIR)
+xmldir=$(XMLDIR)
+
+xml_DATA=fonts.dtd
 
 if CROSS_COMPILING
   RUN_FC_CACHE_TEST=false
@@ -93,17 +97,17 @@
 	mv $@.tmp $@
 
 install-data-local: fonts.conf
-	$(mkinstalldirs) $(DESTDIR)$(configdir) $(DESTDIR)$(fc_cachedir)
-	if [ -f $(DESTDIR)$(configdir)/fonts.conf ]; then \
-	  echo "backing up existing $(DESTDIR)$(configdir)/fonts.conf"; \
-	  mv $(DESTDIR)$(configdir)/fonts.conf $(DESTDIR)$(configdir)/fonts.conf.bak; \
+	$(mkinstalldirs) $(DESTDIR)$(masterconfdir) $(DESTDIR)$(fc_cachedir)
+	if [ -f $(DESTDIR)$(masterconfdir)/fonts.conf ]; then \
+	  echo "backing up existing $(DESTDIR)$(masterconfdir)/fonts.conf"; \
+	  mv $(DESTDIR)$(masterconfdir)/fonts.conf $(DESTDIR)$(masterconfdir)/fonts.conf.bak; \
 	fi
 	if [ -f $(srcdir)/fonts.conf ]; then \
-	  echo " $(INSTALL_DATA) $(srcdir)/fonts.conf $(DESTDIR)$(configdir)/fonts.conf"; \
-	  $(INSTALL_DATA) $(srcdir)/fonts.conf $(DESTDIR)$(configdir)/fonts.conf; \
+	  echo " $(INSTALL_DATA) $(srcdir)/fonts.conf $(DESTDIR)$(masterconfdir)/fonts.conf"; \
+	  $(INSTALL_DATA) $(srcdir)/fonts.conf $(DESTDIR)$(masterconfdir)/fonts.conf; \
 	else if [ -f fonts.conf ]; then \
-	  echo " $(INSTALL_DATA) fonts.conf $(DESTDIR)$(configdir)/fonts.conf"; \
-	  $(INSTALL_DATA) fonts.conf $(DESTDIR)$(configdir)/fonts.conf; \
+	  echo " $(INSTALL_DATA) fonts.conf $(DESTDIR)$(masterconfdir)/fonts.conf"; \
+	  $(INSTALL_DATA) fonts.conf $(DESTDIR)$(masterconfdir)/fonts.conf; \
 	fi; fi
 	@(if $(RUN_FC_CACHE_TEST); then \
 	    echo "fc-cache$(EXEEXT) -s -f -v"; \
@@ -118,14 +122,14 @@
 
 uninstall-local:
 	if [ -f $(srcdir)/fonts.conf ]; then \
-	  if cmp -s $(srcdir)/fonts.conf $(DESTDIR)$(configdir)/fonts.conf; then \
-	     echo " uninstall standard $(DESTDIR)$(configdir)/fonts.conf"; \
-	     rm -f $(DESTDIR)$(configdir)/fonts.conf; \
+	  if cmp -s $(srcdir)/fonts.conf $(DESTDIR)$(masterconfdir)/fonts.conf; then \
+	     echo " uninstall standard $(DESTDIR)$(masterconfdir)/fonts.conf"; \
+	     rm -f $(DESTDIR)$(masterconfdir)/fonts.conf; \
 	  fi; \
 	else if [ -f fonts.conf ]; then \
-	  if cmp -s fonts.conf $(DESTDIR)$(configdir)/fonts.conf; then \
-	     echo " uninstall standard $(DESTDIR)$(configdir)/fonts.conf"; \
-	     rm -f $(DESTDIR)$(configdir)/fonts.conf; \
+	  if cmp -s fonts.conf $(DESTDIR)$(masterconfdir)/fonts.conf; then \
+	     echo " uninstall standard $(DESTDIR)$(masterconfdir)/fonts.conf"; \
+	     rm -f $(DESTDIR)$(masterconfdir)/fonts.conf; \
 	  fi; \
 	fi; fi
 
diff -uNr fontconfig-2.8.0.orig/src/Makefile.am fontconfig-2.8.0/src/Makefile.am
--- fontconfig-2.8.0.orig/src/Makefile.am	2010-07-31 16:06:39.857951486 +0200
+++ fontconfig-2.8.0/src/Makefile.am	2010-08-01 14:52:30.088732514 +0200
@@ -75,7 +75,7 @@
 	$(EXPAT_CFLAGS)					\
 	$(WARN_CFLAGS)					\
 	-DFC_CACHEDIR='"$(FC_CACHEDIR)"'                \
-	-DFONTCONFIG_PATH='"$(CONFDIR)"'
+	-DFONTCONFIG_PATH='"$(MASTERCONFDIR)"'
 
 EXTRA_DIST = makealias