diff --git a/share/xml/bibliography.xml b/share/xml/bibliography.xml
index 71900a016b..ef4cc44947 100644
--- a/share/xml/bibliography.xml
+++ b/share/xml/bibliography.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
   $FreeBSD$
 -->
diff --git a/share/xml/catalog.xml b/share/xml/catalog.xml
index 7dd342c033..dfbd757cdd 100644
--- a/share/xml/catalog.xml
+++ b/share/xml/catalog.xml
@@ -37,7 +37,7 @@
         uri="common.ent" />
   <public
         publicId="-//FreeBSD//ENTITIES FreeBSD L10N Common Entities//EN"
-        uri="l10n.ent" />
+        uri="l10n-common.ent" />
   <public
         publicId="-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
         uri="l10n.ent" />
@@ -65,6 +65,9 @@
   <public
         publicId="-//FreeBSD//DTD FreeBSD XML Database for Multimedia//EN"
         uri="multimedia.dtd"/>
+  <public
+        publicId="-//FreeBSD//DTD FreeBSD XML Database for Mirrors//EN"
+        uri="mirrors.dtd" />
   <public
         publicId="-//FreeBSD//DTD FreeBSD XML Database for Events//EN"
         uri="events.dtd" />
@@ -77,4 +80,32 @@
   <public
 publicId="-//FreeBSD//DTD XHTML 1.0 Transitional-Based Extension//EN"
 uri="xhtml10-freebsd.dtd" />
+  <public
+	publicId="-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN"
+	uri="man-refs.ent" />
+  <public
+	publicId="-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN"
+	uri="freebsd.ent" />
+  <public
+	publicId="-//FreeBSD//ENTITIES DocBook Trademark Entities//EN"
+	uri="trademarks.ent" />
+  <public
+	publicId="-//FreeBSD//ENTITIES DocBook URL Entities//EN"
+	uri="urls.ent" />
+  <public
+	publicId="-//FreeBSD//ENTITIES DocBook Author Entities//EN"
+	uri="authors.ent"/>
+  <public
+	publicId="-//FreeBSD//ENTITIES DocBook Team Entities//EN"
+	uri="../../en_US.ISO8859-1/share/xml/teams.ent"/>
+
+  <public
+	publicId="-//FreeBSD//ENTITIES DocBook Newsgroup Entities//EN"
+	uri="../../en_US.ISO8859-1/share/xml/newsgroups.ent"/>
+  <public
+	publicId="-//FreeBSD//ENTITIES DocBook Glossary Entities//EN"
+	uri="../../en_US.ISO8859-1/share/xml/glossary.ent"/>
+  <public
+	publicId="-//FreeBSD//ENTITIES DocBook Mailing List Entities//EN"
+	uri="../../en_US.ISO8859-1/share/xml/mailing-lists.ent"/>
 </catalog>
diff --git a/share/xml/mirrors-local.xsl b/share/xml/mirrors-local.xsl
index bc2b37d047..f21a45de01 100644
--- a/share/xml/mirrors-local.xsl
+++ b/share/xml/mirrors-local.xsl
@@ -7,7 +7,6 @@
   <xsl:import href="./mirrors-master.xsl" />
 
   <xsl:output type="xml" encoding="iso-8859-1"
-	      omit-xml-declaration="yes"
 	      indent="yes"/>
 
 </xsl:stylesheet>
diff --git a/share/xml/mirrors-master.xsl b/share/xml/mirrors-master.xsl
index 4eed64c5a1..ec2c73b6a2 100644
--- a/share/xml/mirrors-master.xsl
+++ b/share/xml/mirrors-master.xsl
@@ -4,7 +4,6 @@
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
 
   <xsl:output type="xml" encoding="iso-8859-1"
-	      omit-xml-declaration="yes"
 	      indent="yes"/>
 
   <!-- these params should be externally bound. The values
@@ -13,8 +12,6 @@
   <xsl:param name="proto" select="''" />
   <xsl:param name="target" select="''" />
 
-  <xsl:param name="mirrors-docbook-country-anchor-id" select="translate($target, '/.', '--')" />
-
   <xsl:variable name="date">
     <xsl:value-of xmlns:cvs="http://www.FreeBSD.org/XML/CVS"
                   select="normalize-space(//cvs:keyword[@name='freebsd'])"/>
@@ -32,16 +29,22 @@
 
   <xsl:template match="/">
     <xsl:choose>
-      <xsl:when test="$target = 'handbook/mirrors/chapter.xml'">
-	<xsl:call-template name="mirrors-docbook-country-index-all" />
+      <xsl:when test="$target = 'lastmod'">
 	<para>(<xsl:call-template name="mirrors-lastmodified" />)</para>
+      </xsl:when>
+
+      <xsl:when test="$target = 'index'">
+	<xsl:call-template name="mirrors-docbook-country-index-all" />
+      </xsl:when>
+
+      <xsl:when test="$target = 'handbook/mirrors/chapter.xml'">
 	<xsl:call-template name="mirrors-docbook-variablelist" />
       </xsl:when>
+
       <xsl:when test="$target = 'handbook/eresources/chapter.xml'">
-	<xsl:call-template name="mirrors-docbook-country-index-all" />
-	<para>(<xsl:call-template name="mirrors-lastmodified" />)</para>
 	<xsl:call-template name="mirrors-docbook-itemizedlist" />
       </xsl:when>
+
       <xsl:otherwise>
 	<xsl:value-of select="'*** processing error ***'" />
       </xsl:otherwise>
@@ -91,7 +94,7 @@
     <xsl:param name="mirrors-docbook-country-index-without-period" />
     <link>
       <xsl:attribute name="linkend">
-	<xsl:value-of select="concat($mirrors-docbook-country-anchor-id, '-', @id, '-', $type)" />
+	<xsl:value-of select="concat(@id, '-', $type)" />
       </xsl:attribute>
       <xsl:value-of select="country" />
     </link>
@@ -126,7 +129,7 @@
       <term>
 	<anchor>
 	  <xsl:attribute name="id">
-	    <xsl:value-of select="concat($mirrors-docbook-country-anchor-id, '-', @id, '-', $type)" />
+	    <xsl:value-of select="concat(@id, '-', $type)" />
 	  </xsl:attribute>
 	</anchor>
 	<xsl:value-of select="country" />
@@ -211,7 +214,7 @@
     <listitem>
       <anchor>
 	<xsl:attribute name="id">
-	  <xsl:value-of select="concat($mirrors-docbook-country-anchor-id, '-', @id, '-', $type)" />
+	  <xsl:value-of select="concat(@id, '-', $type)" />
 	</xsl:attribute>
       </anchor>
 
diff --git a/share/xml/urls.ent b/share/xml/urls.ent
index 0e309e2890..c92568bde9 100644
--- a/share/xml/urls.ent
+++ b/share/xml/urls.ent
@@ -1,41 +1,10 @@
 <!-- $FreeBSD$ -->
 
 <!ENTITY % freebsd.urls.absolute "IGNORE">
-<!ENTITY % freebsd.urls.relprefix.1 "IGNORE">
-<!ENTITY % freebsd.urls.relprefix.2 "IGNORE">
-<!ENTITY % freebsd.urls.relprefix.3 "IGNORE">
-<!ENTITY % freebsd.urls.relprefix.4 "IGNORE">
-<!ENTITY % freebsd.urls.relprefix.5 "IGNORE">
-<!ENTITY % freebsd.urls.relprefix.6 "IGNORE">
-<!ENTITY % freebsd.urls.relprefix.7 "IGNORE">
-<!ENTITY % freebsd.urls.relprefix.8 "IGNORE">
 
 <!-- Do not edit: start here -->
 
-<![%freebsd.urls.relprefix.1;[
-	<!ENTITY url.relprefix "..">
-]]>
-<![%freebsd.urls.relprefix.2;[
-	<!ENTITY url.relprefix "../..">
-]]>
-<![%freebsd.urls.relprefix.3;[
-	<!ENTITY url.relprefix "../../..">
-]]>
-<![%freebsd.urls.relprefix.4;[
-	<!ENTITY url.relprefix "../../../..">
-]]>
-<![%freebsd.urls.relprefix.5;[
-	<!ENTITY url.relprefix "../../../../..">
-]]>
-<![%freebsd.urls.relprefix.6;[
-	<!ENTITY url.relprefix "../../../../../..">
-]]>
-<![%freebsd.urls.relprefix.7;[
-	<!ENTITY url.relprefix "../../../../../../..">
-]]>
-<![%freebsd.urls.relprefix.8;[
-	<!ENTITY url.relprefix "../../../../../../../..">
-]]>
+<!ENTITY url.relprefix "../../../..">
 
 <![ %freebsd.urls.absolute; [
 <!ENTITY url.base "http://www.FreeBSD.org">