--- docbook-website-2.5.0.0.orig/catalog.xml
+++ docbook-website-2.5.0.0/catalog.xml
@@ -1,20 +1,20 @@
 <?xml version="1.0"?>
+<!DOCTYPE catalog PUBLIC "-//OASIS//DTD XML Catalogs V1.0//EN"
+"http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd">
 <catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
 
-<!--  XML Catalog file for Website. If you are already using
-      an XML catalog, you can just include this one by adding
-      an entry like this to your XML catalog file, editing the
-      path to match the location of your Website installation:
-
-    <nextCatalog catalog="/usr/share/xml/website-2.4.0/catalog.xml" />
--->
-
 <!-- Rewrite rules for the whole tree -->
 
-<rewriteURI uriStartString="http://docbook.sourceforge.net/release/website/2.4.1/schema/"
+<rewriteSystem systemIdStartString="http://docbook.sourceforge.net/release/website/2.5.0/schema/" 
+               rewritePrefix="schema/"/>
+
+<rewriteURI uriStartString="http://docbook.sourceforge.net/release/website/2.5.0/schema/"
             rewritePrefix="schema/"/>
 
-<rewriteURI uriStartString="http://docbook.sourceforge.net/release/website/2.4.1/xsl/"
+<rewriteSystem systemIdStartString="http://docbook.sourceforge.net/release/website/2.5.0/xsl/" 
+	       rewritePrefix="xsl/"/>
+
+<rewriteURI uriStartString="http://docbook.sourceforge.net/release/website/2.5.0/xsl/"
             rewritePrefix="xsl/"/>
 
 <!-- Website DTD locations -->
@@ -24,44 +24,44 @@
        prefer="public">
 
   <public
-    publicId="-//Norman Walsh//DTD Website V2.4.0//EN"
+    publicId="-//Norman Walsh//DTD Website V2.5.0//EN"
     uri="website.dtd"/>
     <!-- this could be the website-custom.dtd instead -->
 
   <public
-    publicId="-//Norman Walsh//DTD Website Custom V2.4.0//EN"
+    publicId="-//Norman Walsh//DTD Website Custom V2.5.0//EN"
     uri="website-custom.dtd"/>
 
   <public
-    publicId="-//Norman Walsh//DTD Website Full V2.4.0//EN"
+    publicId="-//Norman Walsh//DTD Website Full V2.5.0//EN"
     uri="website-full.dtd"/>
 
   <public
-    publicId="-//Norman Walsh//DTD Website Autolayout V2.4.0//EN"
+    publicId="-//Norman Walsh//DTD Website Autolayout V2.5.0//EN"
     uri="autolayout.dtd"/>
 
   <public
-    publicId="-//Norman Walsh//DTD Website Layout V2.4.0//EN"
+    publicId="-//Norman Walsh//DTD Website Layout V2.5.0//EN"
     uri="layout.dtd"/>
 
   <public
-    publicId="-//Norman Walsh//DTD Website Module V2.4.0//EN"
+    publicId="-//Norman Walsh//DTD Website Module V2.5.0//EN"
     uri="website.mod"/>
 
   <public
-    publicId="-//Norman Walsh//DTD Website Extensions Module V2.4.0//EN"
+    publicId="-//Norman Walsh//DTD Website Extensions Module V2.5.0//EN"
     uri="extensions.mod"/>
 
   <public
-    publicId="-//Norman Walsh//DTD Website Namespaces Module V2.4.0//EN"
+    publicId="-//Norman Walsh//DTD Website Namespaces Module V2.5.0//EN"
     uri="namespaces.mod"/>
 
   <public
-    publicId="-//Norman Walsh//DTD Website RDDL Module V2.4.0//EN"
+    publicId="-//Norman Walsh//DTD Website RDDL Module V2.5.0//EN"
     uri="rddl.mod"/>
 
   <public
-    publicId="-//Norman Walsh//DTD Website Forms Module V2.4.0//EN"
+    publicId="-//Norman Walsh//DTD Website Forms Module V2.5.0//EN"
     uri="forms.mod"/>
 </group>
 
@@ -124,6 +124,10 @@
 
 </group>
 
+  <rewriteURI
+    uriStartString="http://docbook.sourceforge.net/release/xsl/current/"
+    rewritePrefix="file:///usr/share/sgml/docbook/stylesheet/xsl/nwalsh/"/>
+
 <!-- You can also put entries like these into your
      main catalog.xml file to map web URLs to local
      paths to avoid pulling docbook files over the web.