diff --git a/share/sgml/catalog.xml b/share/sgml/catalog.xml
index 932a30fd45..d44e550da3 100644
--- a/share/sgml/catalog.xml
+++ b/share/sgml/catalog.xml
@@ -5,6 +5,10 @@
 <!-- $FreeBSD$ -->
 
 <catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
+  <rewriteSystem systemIdStartString="http://www.FreeBSD.org/XML/doc/"
+                 rewritePrefix="../../"/>
+  <rewriteURI uriStartString="http://www.FreeBSD.org/XML/doc/"
+              rewritePrefix="../../"/>
   <rewriteSystem systemIdStartString="http://www.FreeBSD.org/XML/www/"
                  rewritePrefix="../../"/>
   <rewriteURI uriStartString="http://www.FreeBSD.org/XML/www/"
@@ -19,12 +23,12 @@
         publicId="-//FreeBSD//ENTITIES FreeBSD Language Specific Developers Entities//EN"
         uri="developers.ent" />
   <public
-        publicId="-//FreeBSDBSD//ENTITIES FreeBSD Miscellaneous Entities//EN"
+        publicId="-//FreeBSD//ENTITIES FreeBSD Miscellaneous Entities//EN"
         uri="misc.ent" />
+-->
   <public
         publicId="-//FreeBSD//ENTITIES FreeBSD Developers Entities//EN"
         uri="developers.ent" />
--->
   <public
         publicId="-//FreeBSD//ENTITIES ISO 8879:1986 Entity Set//EN//XML"
         uri="iso8859.ent" />
@@ -61,4 +65,7 @@
   <public
         publicId="-//FreeBSD//DTD FreeBSD XML Database for Commercial Gallery//EN"
         uri="gallery.dtd" />
+  <public
+publicId="-//FreeBSD//DTD XHTML 1.0 Transitional-Based Extension//EN"
+uri="xhtml10-freebsd.dtd" />
 </catalog>
diff --git a/share/sgml/xhtml10-freebsd.dtd b/share/sgml/xhtml10-freebsd.dtd
new file mode 100644
index 0000000000..968104a764
--- /dev/null
+++ b/share/sgml/xhtml10-freebsd.dtd
@@ -0,0 +1,49 @@
+<!-- $FreeBSD$ -->
+
+<!-- FreeBSD XHTML 1.0 Transitional-Based Extension -->
+<!-- PUBLIC "-//FreeBSD//DTD XHTML 1.0 Transitional-Based Extension//EN" -->
+
+<!ENTITY % l10n.ent PUBLIC "-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
+"http://www.FreeBSD.org/XML/doc/share/sgml/l10n.ent">
+%l10n.ent;
+
+<!ENTITY % common.ent PUBLIC "-//FreeBSD//ENTITIES FreeBSD Common Entities//EN"
+"http://www.FreeBSD.org/XML/doc/share/sgml/common.ent">
+%common.ent;
+
+<!ENTITY % release.ent PUBLIC "-//FreeBSD//ENTITIES FreeBSD Release Entities//EN"
+"http://www.FreeBSD.org/XML/doc/share/sgml/release.ent">
+%release.ent;
+
+<!ENTITY % navibar.l10n.ent PUBLIC "-//FreeBSD//ENTITIES HTML FreeBSD Navigation Bar L10N Entities//EN"
+"http://www.FreeBSD.org/XML/doc/lang/share/sgml/navibar.l10n.ent">
+%navibar.l10n.ent;
+
+<!ENTITY % navibar.ent PUBLIC "-//FreeBSD//ENTITIES HTML FreeBSD Navigation Bar Entities//EN"
+"http://www.FreeBSD.org/XML/doc/share/sgml/navibar.ent">
+%navibar.ent;
+
+<!ENTITY % header.l10n.ent PUBLIC "-//FreeBSD//ENTITIES HTML FreeBSD Header L10N Entities//EN"
+"http://www.FreeBSD.org/XML/doc/lang/share/sgml/header.l10n.ent">
+%header.l10n.ent;
+
+<!ENTITY % header.ent PUBLIC "-//FreeBSD//ENTITIES HTML FreeBSD Header Entities//EN"
+"http://www.FreeBSD.org/XML/doc/share/sgml/header.ent">
+%header.ent;
+
+<!ENTITY % developers PUBLIC "-//FreeBSD//ENTITIES FreeBSD Developers Entities//EN"
+"http://www.FreeBSD.org/XML/doc/share/sgml/developers.ent">
+%developers;
+
+<!-- Allow xmlns on all elements -->
+<!ENTITY % coreattrs
+ "id          ID             #IMPLIED
+  class       CDATA          #IMPLIED
+  style       CDATA          #IMPLIED
+  title       CDATA          #IMPLIED
+  xmlns	      CDATA          #IMPLIED"
+  >
+
+<!ENTITY % html.orig PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+%html.orig;