diff --git a/Makefile.am b/Makefile.am
index cf90617..1ebb869 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -23,7 +23,7 @@
 
 DOCSRC=@DOCSRC@
 SUBDIRS=fontconfig fc-case fc-lang fc-glyphname fc-arch src \
-	fc-cache fc-cat fc-list fc-match conf.d $(DOCSRC) test
+	fc-cache fc-cat fc-list fc-match conf.avail conf.d $(DOCSRC) test
 	 
 EXTRA_DIST = \
         fontconfig.pc.in \
diff --git a/conf.avail/10-urw-aliases.conf b/conf.avail/10-urw-aliases.conf
new file mode 100644
index 0000000..23cbc09
--- /dev/null
+++ b/conf.avail/10-urw-aliases.conf
@@ -0,0 +1,47 @@
+<!--
+  URW provides metric and shape compatible fonts for these 10 Adobe families.
+  -->
+        <alias>
+          <family>Avant Garde</family>
+          <accept><family>URW Gothic L</family></accept>
+        </alias>
+        <alias>
+          <family>Bookman</family>
+          <accept><family>URW Bookman L</family></accept>
+        </alias>
+        <alias>
+	  <family>Courier</family>
+	  <accept><family>Nimbus Mono L</family></accept>
+	</alias>
+        <alias>
+	  <family>Helvetica</family>
+	  <accept><family>Nimbus Sans L</family></accept>
+	</alias>
+        <alias>
+          <family>New Century Schoolbook</family>
+          <accept><family>Century Schoolbook L</family></accept>
+        </alias>
+        <alias>
+          <family>Palatino</family>
+          <accept><family>URW Palladio L</family></accept>
+        </alias>
+        <alias>
+	  <family>Times</family>
+	  <accept><family>Nimbus Roman No9 L</family></accept>
+	</alias>
+        <alias>
+	  <family>Zapf Chancery</family>
+	  <accept><family>URW Chancery L</family></accept>
+	</alias>
+        <alias>
+	  <family>Zapf Dingbats</family>
+	  <accept><family>Dingbats</family></accept>
+	</alias>
+	<match target="pattern">
+	  <test name="family">
+	    <string>Symbol</string>
+	  </test>
+	  <edit name="family" mode="append" binding="strong">
+	    <string>Standard Symbols L</string>
+	  </edit>
+	</match>
diff --git a/conf.avail/15-amt-aliases.conf b/conf.avail/15-amt-aliases.conf
new file mode 100644
index 0000000..ba73638
--- /dev/null
+++ b/conf.avail/15-amt-aliases.conf
@@ -0,0 +1,16 @@
+<!--
+ AMT provides metric and shape compatible fonts for these three web font
+ families.
+ -->
+ 	<alias>
+		<family>Times New Roman</family>
+		<accept><family>Thorndale AMT</family></accept>
+	</alias>
+ 	<alias>
+		<family>Arial</family>
+		<accept><family>Albany AMT</family></accept>
+	</alias>
+ 	<alias>
+		<family>Courier New</family>
+		<accept><family>Cumberland AMT</family></accept>
+	</alias>
diff --git a/conf.avail/20-fix-globaladvance.conf b/conf.avail/20-fix-globaladvance.conf
new file mode 100644
index 0000000..8d76d32
--- /dev/null
+++ b/conf.avail/20-fix-globaladvance.conf
@@ -0,0 +1,24 @@
+<!--
+  Some Asian fonts misadvertise themselves as monospaced when
+  in fact they are dual-spaced (half and full).  This makes
+  FreeType very confused as it forces all widths to match.
+  Undo this magic by disabling the width forcing code -->
+	<match target="font">
+		<test name="family"><string>GulimChe</string></test>
+		<edit name="globaladvance"><bool>false</bool></edit>
+	</match>
+
+	<match target="font">
+		<test name="family"><string>DotumChe</string></test>
+		<edit name="globaladvance"><bool>false</bool></edit>
+	</match>
+
+	<match target="font">
+		<test name="family"><string>BatangChe</string></test>
+		<edit name="globaladvance"><bool>false</bool></edit>
+	</match>
+
+	<match target="font">
+		<test name="family"><string>GungsuhChe</string></test>
+		<edit name="globaladvance"><bool>false</bool></edit>
+	</match>
diff --git a/conf.avail/30-unhint-small-vera.conf b/conf.avail/30-unhint-small-vera.conf
new file mode 100644
index 0000000..245580f
--- /dev/null
+++ b/conf.avail/30-unhint-small-vera.conf
@@ -0,0 +1,44 @@
+<!-- 
+	The Bitstream Vera fonts have GASP entries suggesting that hinting be
+	disabled below 8 ppem, but FreeType ignores those, preferring to use
+	the data found in the instructed hints.  The initial Vera release
+	didn't include the right instructions in the 'prep' table. Fix this
+	by disabling hinting manually at smaller sizes (< 8ppem)
+ -->
+
+	<match target="font">
+		<test name="family">
+			<string>Bitstream Vera Sans</string>
+		</test>
+		<test name="pixelsize" compare="less">
+			<double>7.5</double>
+		</test>
+		<edit name="hinting">
+			<bool>false</bool>
+		</edit>
+	</match>
+
+	<match target="font">
+		<test name="family">
+			<string>Bitstream Vera Serif</string>
+		</test>
+		<test name="pixelsize" compare="less">
+			<double>7.5</double>
+		</test>
+		<edit name="hinting">
+			<bool>false</bool>
+		</edit>
+	</match>
+
+	<match target="font">
+		<test name="family">
+			<string>Bitstream Vera Sans Mono</string>
+		</test>
+		<test name="pixelsize" compare="less">
+			<double>7.5</double>
+		</test>
+		<edit name="hinting">
+			<bool>false</bool>
+		</edit>
+	</match>
+
diff --git a/conf.avail/50-user.conf b/conf.avail/50-user.conf
new file mode 100644
index 0000000..9a38a40
--- /dev/null
+++ b/conf.avail/50-user.conf
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<!-- /etc/fonts/conf.avail/50-user.conf file to configure system font access -->
+<fontconfig>
+	<!-- Load per-user customization file -->
+	<include ignore_missing="yes">~/.fonts.conf</include>
+</fontconfig>
diff --git a/conf.avail/51-local.conf b/conf.avail/51-local.conf
new file mode 100644
index 0000000..d35046e
--- /dev/null
+++ b/conf.avail/51-local.conf
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<!-- /etc/fonts/conf.avail/51-local.conf file to configure system font access -->
+<fontconfig>
+	<!-- Load local system customization file -->
+	<include ignore_missing="yes">local.conf</include>
+</fontconfig>
diff --git a/conf.d/10LohitGujarati.conf b/conf.avail/60-LohitGujarati.conf
similarity index 100%
rename from conf.d/10LohitGujarati.conf
rename to conf.avail/60-LohitGujarati.conf
diff --git a/conf.d/60-delicious.conf b/conf.avail/60-delicious.conf
similarity index 100%
rename from conf.d/60-delicious.conf
rename to conf.avail/60-delicious.conf
diff --git a/conf.d/10-fonts-persian.conf b/conf.avail/60-fonts-persian.conf
similarity index 100%
rename from conf.d/10-fonts-persian.conf
rename to conf.avail/60-fonts-persian.conf
diff --git a/conf.d/no-sub-pixel.conf b/conf.avail/70-no-sub-pixel.conf
similarity index 100%
rename from conf.d/no-sub-pixel.conf
rename to conf.avail/70-no-sub-pixel.conf
diff --git a/conf.avail/70-sub-pixel-bgr.conf b/conf.avail/70-sub-pixel-bgr.conf
new file mode 100644
index 0000000..2aba95e
--- /dev/null
+++ b/conf.avail/70-sub-pixel-bgr.conf
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<!-- conf.d/sub-pixel.conf -->
+<fontconfig>
+<!--  Enable sub-pixel rendering --> 
+  <match target="font">
+    <edit name="rgba" mode="assign"><const>bgr</const></edit>
+  </match>
+</fontconfig>
diff --git a/conf.d/sub-pixel.conf b/conf.avail/70-sub-pixel-rgb.conf
similarity index 100%
rename from conf.d/sub-pixel.conf
rename to conf.avail/70-sub-pixel-rgb.conf
diff --git a/conf.avail/70-sub-pixel-vbgr.conf b/conf.avail/70-sub-pixel-vbgr.conf
new file mode 100644
index 0000000..0cdad2a
--- /dev/null
+++ b/conf.avail/70-sub-pixel-vbgr.conf
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<!-- conf.d/sub-pixel.conf -->
+<fontconfig>
+<!--  Enable sub-pixel rendering --> 
+  <match target="font">
+    <edit name="rgba" mode="assign"><const>vbgr</const></edit>
+  </match>
+</fontconfig>
diff --git a/conf.avail/70-sub-pixel-vrgb.conf b/conf.avail/70-sub-pixel-vrgb.conf
new file mode 100644
index 0000000..60239e0
--- /dev/null
+++ b/conf.avail/70-sub-pixel-vrgb.conf
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<!-- conf.d/sub-pixel.conf -->
+<fontconfig>
+<!--  Enable sub-pixel rendering --> 
+  <match target="font">
+    <edit name="rgba" mode="assign"><const>vrgb</const></edit>
+  </match>
+</fontconfig>
diff --git a/conf.d/autohint.conf b/conf.avail/73-autohint.conf
similarity index 100%
rename from conf.d/autohint.conf
rename to conf.avail/73-autohint.conf
diff --git a/conf.d/unhinted.conf b/conf.avail/73-unhinted.conf
similarity index 100%
rename from conf.d/unhinted.conf
rename to conf.avail/73-unhinted.conf
diff --git a/conf.d/no-bitmaps.conf b/conf.avail/76-no-bitmaps.conf
similarity index 100%
rename from conf.d/no-bitmaps.conf
rename to conf.avail/76-no-bitmaps.conf
diff --git a/conf.d/yes-bitmaps.conf b/conf.avail/76-yes-bitmaps.conf
similarity index 100%
rename from conf.d/yes-bitmaps.conf
rename to conf.avail/76-yes-bitmaps.conf
diff --git a/conf.avail/Makefile.am b/conf.avail/Makefile.am
new file mode 100644
index 0000000..a999dd6
--- /dev/null
+++ b/conf.avail/Makefile.am
@@ -0,0 +1,49 @@
+# 
+#  $Id$
+# 
+#  Copyright © 2005 Keith Packard
+# 
+#  Permission to use, copy, modify, distribute, and sell this software and its
+#  documentation for any purpose is hereby granted without fee, provided that
+#  the above copyright notice appear in all copies and that both that
+#  copyright notice and this permission notice appear in supporting
+#  documentation, and that the name of Keith Packard not be used in
+#  advertising or publicity pertaining to distribution of the software without
+#  specific, written prior permission.  Keith Packard makes no
+#  representations about the suitability of this software for any purpose.  It
+#  is provided "as is" without express or implied warranty.
+# 
+#  KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+#  INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+#  EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+#  CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+#  DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+#  TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+#  PERFORMANCE OF THIS SOFTWARE.
+
+CONF_FILES = \
+	10-urw-aliases.conf \
+	15-amt-aliases.conf \
+	20-fix-globaladvance.conf \
+	30-unhint-small-vera.conf \
+	50-user.conf \
+	51-local.conf \
+	60-LohitGujarati.conf \
+	60-delicious.conf \
+	60-fonts-persian.conf \
+	70-no-sub-pixel.conf \
+	70-sub-pixel-bgr.conf \
+	70-sub-pixel-rgb.conf \
+	70-sub-pixel-vbgr.conf \
+	70-sub-pixel-vrgb.conf \
+	73-autohint.conf \
+	73-unhinted.conf \
+	76-no-bitmaps.conf \
+	76-yes-bitmaps.conf
+
+EXTRA_DIST = $(CONF_FILES)
+
+configdir=$(CONFDIR)
+confavaildir=$(configdir)/conf.avail
+
+confavail_DATA=$(CONF_FILES)
diff --git a/conf.d/README b/conf.avail/README
similarity index 100%
rename from conf.d/README
rename to conf.avail/README
diff --git a/conf.d/Makefile.am b/conf.d/Makefile.am
index 98e8dbd..85d7135 100644
--- a/conf.d/Makefile.am
+++ b/conf.d/Makefile.am
@@ -21,20 +21,32 @@
 #  TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 #  PERFORMANCE OF THIS SOFTWARE.
 
-CONF_FILES = \
-	10LohitGujarati.conf \
-	10-fonts-persian.conf \
+CONF_LINKS = \
+	10-urw-aliases.conf \
+	15-amt-aliases.conf \
+	20-fix-globaladvance.conf \
+	30-unhint-small-vera.conf \
+	50-user.conf \
+	51-local.conf \
+	60-LohitGujarati.conf \
 	60-delicious.conf \
-	autohint.conf \
-	no-bitmaps.conf \
-	no-sub-pixel.conf \
-	sub-pixel.conf \
-	unhinted.conf \
-	yes-bitmaps.conf
+	60-fonts-persian.conf
 
-EXTRA_DIST = $(CONF_FILES)
+EXTRA_DIST = $(CONF_LINKS)
 
 configdir=$(CONFDIR)
 confddir=$(configdir)/conf.d
 
-confd_DATA=$(CONF_FILES)
+install:
+	mkdir -p ${DESTDIR}/${confddir}
+	ln -s ../conf.avail/10-urw-aliases.conf ${DESTDIR}/${confddir}
+	ln -s ../conf.avail/15-amt-aliases.conf ${DESTDIR}/${confddir}
+	ln -s ../conf.avail/20-fix-globaladvance.conf ${DESTDIR}/${confddir}
+	ln -s ../conf.avail/30-unhint-small-vera.conf ${DESTDIR}/${confddir}
+	ln -s ../conf.avail/50-user.conf ${DESTDIR}/${confddir}
+	ln -s ../conf.avail/51-local.conf ${DESTDIR}/${confddir}
+	ln -s ../conf.avail/60-LohitGujarati.conf ${DESTDIR}/${confddir}
+	ln -s ../conf.avail/60-delicious.conf ${DESTDIR}/${confddir}
+	ln -s ../conf.avail/60-fonts-persian.conf ${DESTDIR}/${confddir}
+
+
diff --git a/configure.in b/configure.in
index 3226dd0..d8afffb 100644
--- a/configure.in
+++ b/configure.in
@@ -563,6 +563,7 @@ fc-case/Makefile
 fc-arch/Makefile
 src/Makefile
 src/fontconfig.def
+conf.avail/Makefile
 conf.d/Makefile
 fc-cache/Makefile
 fc-cat/Makefile
diff --git a/fonts.conf.in b/fonts.conf.in
index adc44e8..d70800e 100644
--- a/fonts.conf.in
+++ b/fonts.conf.in
@@ -149,149 +149,10 @@
 		</edit>
 	</match>
 
-<!--
-  URW provides metric and shape compatible fonts for these 10 Adobe families.
-  -->
-        <alias>
-          <family>Avant Garde</family>
-          <accept><family>URW Gothic L</family></accept>
-        </alias>
-        <alias>
-          <family>Bookman</family>
-          <accept><family>URW Bookman L</family></accept>
-        </alias>
-        <alias>
-	  <family>Courier</family>
-	  <accept><family>Nimbus Mono L</family></accept>
-	</alias>
-        <alias>
-	  <family>Helvetica</family>
-	  <accept><family>Nimbus Sans L</family></accept>
-	</alias>
-        <alias>
-          <family>New Century Schoolbook</family>
-          <accept><family>Century Schoolbook L</family></accept>
-        </alias>
-        <alias>
-          <family>Palatino</family>
-          <accept><family>URW Palladio L</family></accept>
-        </alias>
-        <alias>
-	  <family>Times</family>
-	  <accept><family>Nimbus Roman No9 L</family></accept>
-	</alias>
-        <alias>
-	  <family>Zapf Chancery</family>
-	  <accept><family>URW Chancery L</family></accept>
-	</alias>
-        <alias>
-	  <family>Zapf Dingbats</family>
-	  <accept><family>Dingbats</family></accept>
-	</alias>
-	<match target="pattern">
-	  <test name="family">
-	    <string>Symbol</string>
-	  </test>
-	  <edit name="family" mode="append" binding="strong">
-	    <string>Standard Symbols L</string>
-	  </edit>
-	</match>
-<!--
- AMT provides metric and shape compatible fonts for these three web font
- families.
- -->
- 	<alias>
-		<family>Times New Roman</family>
-		<accept><family>Thorndale AMT</family></accept>
-	</alias>
- 	<alias>
-		<family>Arial</family>
-		<accept><family>Albany AMT</family></accept>
-	</alias>
- 	<alias>
-		<family>Courier New</family>
-		<accept><family>Cumberland AMT</family></accept>
-	</alias>
- 
-<!--
-  Some Asian fonts misadvertise themselves as monospaced when
-  in fact they are dual-spaced (half and full).  This makes
-  FreeType very confused as it forces all widths to match.
-  Undo this magic by disabling the width forcing code -->
-	<match target="font">
-		<test name="family"><string>GulimChe</string></test>
-		<edit name="globaladvance"><bool>false</bool></edit>
-	</match>
-
-	<match target="font">
-		<test name="family"><string>DotumChe</string></test>
-		<edit name="globaladvance"><bool>false</bool></edit>
-	</match>
-
-	<match target="font">
-		<test name="family"><string>BatangChe</string></test>
-		<edit name="globaladvance"><bool>false</bool></edit>
-	</match>
-
-	<match target="font">
-		<test name="family"><string>GungsuhChe</string></test>
-		<edit name="globaladvance"><bool>false</bool></edit>
-	</match>
-
-<!-- 
-	The Bitstream Vera fonts have GASP entries suggesting that hinting be
-	disabled below 8 ppem, but FreeType ignores those, preferring to use
-	the data found in the instructed hints.  The initial Vera release
-	didn't include the right instructions in the 'prep' table. Fix this
-	by disabling hinting manually at smaller sizes (< 8ppem)
- -->
-
-	<match target="font">
-		<test name="family">
-			<string>Bitstream Vera Sans</string>
-		</test>
-		<test name="pixelsize" compare="less">
-			<double>7.5</double>
-		</test>
-		<edit name="hinting">
-			<bool>false</bool>
-		</edit>
-	</match>
-
-	<match target="font">
-		<test name="family">
-			<string>Bitstream Vera Serif</string>
-		</test>
-		<test name="pixelsize" compare="less">
-			<double>7.5</double>
-		</test>
-		<edit name="hinting">
-			<bool>false</bool>
-		</edit>
-	</match>
-
-	<match target="font">
-		<test name="family">
-			<string>Bitstream Vera Sans Mono</string>
-		</test>
-		<test name="pixelsize" compare="less">
-			<double>7.5</double>
-		</test>
-		<edit name="hinting">
-			<bool>false</bool>
-		</edit>
-	</match>
-
-<!--
-  Load per-user customization file
--->
-	<include ignore_missing="yes">~/.fonts.conf</include>
-
 <!--
   Load local system customization file
 -->
 	<include ignore_missing="yes">conf.d</include>
-	<include ignore_missing="yes">local.conf</include>
 
 <!--
   Provide required aliases for standard names