diff --git a/conf.avail/10-urw-aliases.conf b/conf.avail/10-urw-aliases.conf
index 23cbc09..10e6ce9 100644
--- a/conf.avail/10-urw-aliases.conf
+++ b/conf.avail/10-urw-aliases.conf
@@ -1,3 +1,7 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<!-- conf.d/sub-pixel.conf -->
+<fontconfig>
 <!--
   URW provides metric and shape compatible fonts for these 10 Adobe families.
   -->
@@ -45,3 +49,4 @@
 	    <string>Standard Symbols L</string>
 	  </edit>
 	</match>
+</fontconfig>
diff --git a/conf.avail/15-amt-aliases.conf b/conf.avail/15-amt-aliases.conf
index ba73638..d6df67e 100644
--- a/conf.avail/15-amt-aliases.conf
+++ b/conf.avail/15-amt-aliases.conf
@@ -1,3 +1,7 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<!-- conf.d/sub-pixel.conf -->
+<fontconfig>
 <!--
  AMT provides metric and shape compatible fonts for these three web font
  families.
@@ -14,3 +18,4 @@
 		<family>Courier New</family>
 		<accept><family>Cumberland AMT</family></accept>
 	</alias>
+</fontconfig>
diff --git a/conf.avail/20-fix-globaladvance.conf b/conf.avail/20-fix-globaladvance.conf
index 8d76d32..a62162c 100644
--- a/conf.avail/20-fix-globaladvance.conf
+++ b/conf.avail/20-fix-globaladvance.conf
@@ -1,3 +1,7 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<!-- conf.d/sub-pixel.conf -->
+<fontconfig>
 <!--
   Some Asian fonts misadvertise themselves as monospaced when
   in fact they are dual-spaced (half and full).  This makes
@@ -22,3 +26,4 @@
 		<test name="family"><string>GungsuhChe</string></test>
 		<edit name="globaladvance"><bool>false</bool></edit>
 	</match>
+</fontconfig>
diff --git a/conf.avail/30-unhint-small-vera.conf b/conf.avail/30-unhint-small-vera.conf
index 245580f..3078119 100644
--- a/conf.avail/30-unhint-small-vera.conf
+++ b/conf.avail/30-unhint-small-vera.conf
@@ -1,3 +1,7 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<!-- conf.d/sub-pixel.conf -->
+<fontconfig>
 <!-- 
 	The Bitstream Vera fonts have GASP entries suggesting that hinting be
 	disabled below 8 ppem, but FreeType ignores those, preferring to use
@@ -42,3 +46,4 @@
 		</edit>
 	</match>
 
+</fontconfig>
diff --git a/conf.avail/Makefile.am b/conf.avail/Makefile.am
index a999dd6..6c9f4e1 100644
--- a/conf.avail/Makefile.am
+++ b/conf.avail/Makefile.am
@@ -41,9 +41,31 @@ CONF_FILES = \
 	76-no-bitmaps.conf \
 	76-yes-bitmaps.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 \
+	60-fonts-persian.conf
+
 EXTRA_DIST = $(CONF_FILES)
 
 configdir=$(CONFDIR)
 confavaildir=$(configdir)/conf.avail
+confddir=$(configdir)/conf.d
 
 confavail_DATA=$(CONF_FILES)
+
+install-data-local:
+	mkdir -p ${DESTDIR}${confddir}
+	@(echo cd ${DESTDIR}${confddir}; \
+	 cd ${DESTDIR}${confddir}; \
+	 for i in ${CONF_LINKS}; do \
+	 	rm -f $$i; \
+		echo rm -f $$i";" ln -s ../conf.avail/$$i .; \
+		ln -s ../conf.avail/$$i .; \
+	 done)
diff --git a/conf.d/Makefile.am b/conf.d/Makefile.am
deleted file mode 100644
index 85d7135..0000000
--- a/conf.d/Makefile.am
+++ /dev/null
@@ -1,52 +0,0 @@
-# 
-#  $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_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 \
-	60-fonts-persian.conf
-
-EXTRA_DIST = $(CONF_LINKS)
-
-configdir=$(CONFDIR)
-confddir=$(configdir)/conf.d
-
-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}
-
-