diff -uNr libxml2-2.6.11/catalog.c libxml2-2.6.11-new/catalog.c
--- libxml2-2.6.11/catalog.c	2004-06-27 12:14:07.000000000 -0400
+++ libxml2-2.6.11-new/catalog.c	2004-07-07 18:27:17.000000000 -0400
@@ -62,10 +62,10 @@
 #define XML_URN_PUBID "urn:publicid:"
 #define XML_CATAL_BREAK ((xmlChar *) -1)
 #ifndef XML_XML_DEFAULT_CATALOG
-#define XML_XML_DEFAULT_CATALOG "file:///etc/xml/catalog"
+#define XML_XML_DEFAULT_CATALOG "file://@PREFIX@/etc/xml/catalog"
 #endif
 #ifndef XML_SGML_DEFAULT_CATALOG
-#define XML_SGML_DEFAULT_CATALOG "file:///etc/sgml/catalog"
+#define XML_SGML_DEFAULT_CATALOG "file://@PREFIX@/etc/sgml/catalog"
 #endif
 
 #if defined(_WIN32) && defined(_MSC_VER)
diff -uNr libxml2-2.6.11/doc/xmllint.1 libxml2-2.6.11-new/doc/xmllint.1
--- libxml2-2.6.11/doc/xmllint.1	2004-06-27 07:56:46.000000000 -0400
+++ libxml2-2.6.11-new/doc/xmllint.1	2004-07-07 18:27:47.000000000 -0400
@@ -152,7 +152,7 @@
 
 .TP
 \fB\-\-catalogs\fR
-Use the catalogs from $SGML_CATALOG_FILES\&. Otherwise /etc/xml/catalog is used by default\&.
+Use the catalogs from $SGML_CATALOG_FILES\&. Otherwise @PREFIX@/etc/xml/catalog is used by default\&.
 
 .TP
 \fB\-\-nocatalogs\fR
@@ -270,7 +270,7 @@
 .SH "CATALOGS"
 
 .PP
-Catalog behavior can be changed by redirecting queries to the user's own set of catalogs\&. This can be done by setting the \fIXML_CATALOG_FILES\fR environment variable to a list of catalogs\&. An empty one should deactivate loading the default \fI/etc/xml/catalog\fR default catalog\&.
+Catalog behavior can be changed by redirecting queries to the user's own set of catalogs\&. This can be done by setting the \fIXML_CATALOG_FILES\fR environment variable to a list of catalogs\&. An empty one should deactivate loading the default \fI@PREFIX@/etc/xml/catalog\fR default catalog\&.
 
 .SH "DEBUGGING CATALOGS"
 
diff -uNr libxml2-2.6.11/ltmain.sh libxml2-2.6.11-new/ltmain.sh
--- libxml2-2.6.11/ltmain.sh	2004-07-05 13:46:24.000000000 -0400
+++ libxml2-2.6.11-new/ltmain.sh	2004-07-07 18:27:18.000000000 -0400
@@ -2211,7 +2211,7 @@
 	   { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
 	  if test "$installed" = no; then
 	    notinst_deplibs="$notinst_deplibs $lib"
-	    need_relink=yes
+	    need_relink=no
 	  fi
 	  # This is a shared library
 	
diff -uNr libxml2-2.6.11/update-sgml-catalog libxml2-2.6.11-new/update-sgml-catalog
--- libxml2-2.6.11/update-sgml-catalog	1969-12-31 19:00:00.000000000 -0500
+++ libxml2-2.6.11-new/update-sgml-catalog	2004-07-07 18:27:18.000000000 -0400
@@ -0,0 +1,28 @@
+#!/bin/sh -e
+#
+# update-sgml-catalog
+# see DescPackaging field of libxml2 .info file for usage.
+#
+
+CATALOG=@PREFIX@/etc/sgml/catalog
+CATALOG_D=@PREFIX@/etc/sgml/catalog.d
+
+mkdir -p ${CATALOG_D}
+
+TMPFILE=`tempfile`
+
+if [ "`echo ${CATALOG_D}/*`" != "${CATALOG_D}/*" ]; then
+  cat ${CATALOG_D}/* | sed 's/#.*$//g' | {
+    while read cat; do
+      if [ -z "${cat}" ]; then
+        continue
+      fi
+      echo CATALOG ${cat} >>${TMPFILE}
+    done
+  }
+fi
+
+mv -f ${TMPFILE} ${CATALOG}
+chmod 0644 ${CATALOG}
+
+exit 0
diff -uNr libxml2-2.6.11/update-xml-catalog libxml2-2.6.11-new/update-xml-catalog
--- libxml2-2.6.11/update-xml-catalog	1969-12-31 19:00:00.000000000 -0500
+++ libxml2-2.6.11-new/update-xml-catalog	2004-07-07 18:27:18.000000000 -0400
@@ -0,0 +1,29 @@
+#!/bin/sh -e
+#
+# update-xml-catalog
+# see DescPackaging field of libxml2 .info file for usage.
+#
+
+CATALOG=@PREFIX@/etc/xml/catalog
+CATALOG_D=@PREFIX@/etc/xml/catalog.d
+
+mkdir -p ${CATALOG_D}
+
+TMPFILE=`tempfile`
+xmlcatalog --create >>${TMPFILE}
+
+if [ "`echo ${CATALOG_D}/*`" != "${CATALOG_D}/*" ]; then
+  cat ${CATALOG_D}/* | sed 's/#.*$//g' | {
+    while read type orig replace; do
+      if [ -z "${type}" -o -z "${orig}" -o -z "${replace}" ]; then
+        continue
+      fi
+      eval xmlcatalog --noout --add ${type} ${orig} ${replace} ${TMPFILE}
+    done
+  }
+fi
+
+mv -f ${TMPFILE} ${CATALOG}
+chmod 0644 ${CATALOG}
+
+exit 0
diff -uNr libxml2-2.6.11/xmlcatalog.c libxml2-2.6.11-new/xmlcatalog.c
--- libxml2-2.6.11/xmlcatalog.c	2004-03-04 09:00:11.000000000 -0500
+++ libxml2-2.6.11-new/xmlcatalog.c	2004-07-07 18:27:18.000000000 -0400
@@ -42,7 +42,7 @@
 
 
 #ifndef XML_SGML_DEFAULT_CATALOG
-#define XML_SGML_DEFAULT_CATALOG "/etc/sgml/catalog"
+#define XML_SGML_DEFAULT_CATALOG "@PREFIX@/etc/sgml/catalog"
 #endif
 
 /************************************************************************
diff -uNr libxml2-2.6.11/xmllint.c libxml2-2.6.11-new/xmllint.c
--- libxml2-2.6.11/xmllint.c	2004-06-27 07:56:46.000000000 -0400
+++ libxml2-2.6.11-new/xmllint.c	2004-07-07 18:27:18.000000000 -0400
@@ -94,7 +94,7 @@
 #endif
 
 #ifndef XML_XML_DEFAULT_CATALOG
-#define XML_XML_DEFAULT_CATALOG "file:///etc/xml/catalog"
+#define XML_XML_DEFAULT_CATALOG "file://@PREFIX@/etc/xml/catalog"
 #endif
 
 typedef enum {