95 files changed, 215 insertions, 215 deletions
diff --git a/share/examples/add-manref.sh b/share/examples/add-manref.sh
index c0191d2030..0fdb1b4f57 100644
--- a/share/examples/add-manref.sh
+++ b/share/examples/add-manref.sh
@@ -14,7 +14,7 @@
 # This is also very ugly, but that's the price of not having Tcl in
 # the base system!
 #
-# Tested with doc/share/sgml/man-refs.ent rev. 1.85 (dd, 2001/06/30).
+# Tested with doc/share/xml/man-refs.ent rev. 1.85 (dd, 2001/06/30).
 #
 # Exit codes: 0- added; 1- exists; 2- something else;
 #
diff --git a/share/examples/check-manref.sh b/share/examples/check-manref.sh
index 0214d6be6e..f6cc94098c 100644
--- a/share/examples/check-manref.sh
+++ b/share/examples/check-manref.sh
@@ -14,7 +14,7 @@
 # be necessary to run it more than once per section to make sure
 # everything is clean.
 #
-# Used to create doc/share/sgml/man-refs.ent rev. 1.85 (dd, 2001/06/30).
+# Used to create doc/share/xml/man-refs.ent rev. 1.85 (dd, 2001/06/30).
 #
 # Exit codes: 0- okay; 1- something out of order; 2- something else;
 #
diff --git a/share/images/callouts/gen.sh b/share/images/callouts/gen.sh
index 6b374f11d0..3253bb3860 100644
--- a/share/images/callouts/gen.sh
+++ b/share/images/callouts/gen.sh
@@ -3,7 +3,7 @@
 # $FreeBSD$
 
 # For more than 30 adjust %callout-graphics-number-limit%
-# in doc/share/sgml/freebsd-html.dsl
+# in doc/share/xml/freebsd-html.dsl
 
 for i in `jot 9 1`
 do
diff --git a/share/mk/doc.docbook.mk b/share/mk/doc.docbook.mk
index 644b7394f9..4669dff66e 100644
--- a/share/mk/doc.docbook.mk
+++ b/share/mk/doc.docbook.mk
@@ -122,7 +122,7 @@ SP_ENCODING_LIST?=	ISO-8859-2 KOI8-R
 STYLESHEET_TYPE?=	dsssl
 
 .if defined(SPELLCHECK)
-DSLHTML?= ${DOC_PREFIX}/share/sgml/spellcheck.dsl
+DSLHTML?= ${DOC_PREFIX}/share/xml/spellcheck.dsl
 .endif
 
 XMLLINT?=	/usr/local/bin/xmllint
@@ -144,11 +144,11 @@ JADE_ENV+=	SP_ENCODING=${SP_ENCODING}
 .endif
 JADE_CMD=	${SETENV} ${JADE_ENV} ${JADE}
 
-DSLHTML?=	${DOC_PREFIX}/share/sgml/default.dsl
-DSLPRINT?=	${DOC_PREFIX}/share/sgml/default.dsl
-DSLPGP?=	${DOC_PREFIX}/share/sgml/pgp.dsl
-FREEBSDCATALOG=	${DOC_PREFIX}/share/sgml/catalog
-LANGUAGECATALOG=${DOC_PREFIX}/${LANGCODE}/share/sgml/catalog
+DSLHTML?=	${DOC_PREFIX}/share/xml/default.dsl
+DSLPRINT?=	${DOC_PREFIX}/share/xml/default.dsl
+DSLPGP?=	${DOC_PREFIX}/share/xml/pgp.dsl
+FREEBSDCATALOG=	${DOC_PREFIX}/share/xml/catalog
+LANGUAGECATALOG=${DOC_PREFIX}/${LANGCODE}/share/xml/catalog
 
 ISO8879CATALOG=	${PREFIX}/share/sgml/iso8879/catalog
 
diff --git a/share/mk/doc.html.mk b/share/mk/doc.html.mk
index cb84f4a6f3..d7559fd1f7 100644
--- a/share/mk/doc.html.mk
+++ b/share/mk/doc.html.mk
@@ -42,7 +42,7 @@ KNOWN_FORMATS=	html txt tar pdb
 
 CSS_SHEET?=
 
-HTMLCATALOG=	${PREFIX}/share/sgml/html/catalog
+HTMLCATALOG=	${PREFIX}/share/xml/html/catalog
 
 IMAGES_LIB?=
 
diff --git a/share/mk/doc.xml.mk b/share/mk/doc.xml.mk
index 0ee1746772..14ee8543de 100644
--- a/share/mk/doc.xml.mk
+++ b/share/mk/doc.xml.mk
@@ -2,13 +2,13 @@
 # $FreeBSD$
 
 XML_CATALOG_FILES=	file://${.OBJDIR}/catalog-cwd.xml \
-			file://${DOC_PREFIX}/${LANGCODE}/share/sgml/catalog.xml \
-			file://${DOC_PREFIX}/share/sgml/catalog.xml \
-			file://${DOC_PREFIX}/share/sgml/catalog-common.xml \
+			file://${DOC_PREFIX}/${LANGCODE}/share/xml/catalog.xml \
+			file://${DOC_PREFIX}/share/xml/catalog.xml \
+			file://${DOC_PREFIX}/share/xml/catalog-common.xml \
 			file://${LOCALBASE}/share/xml/catalog
 
-.if exists(${DOC_PREFIX}/share/sgml/catalog-cwd.xml)
-XML_CATALOG_CWD=	${DOC_PREFIX}/share/sgml/catalog-cwd.xml
+.if exists(${DOC_PREFIX}/share/xml/catalog-cwd.xml)
+XML_CATALOG_CWD=	${DOC_PREFIX}/share/xml/catalog-cwd.xml
 .endif
 
 # Variables used in DEPENDSET
@@ -29,10 +29,10 @@ _XML_INCLIST=	libcommon.l10n.xsl \
 		l10n.ent \
 		release.ent
 .for F in ${_INCLIST}
-.if exists(${DOC_PREFIX}/${LANGCODE}/share/sgml/${F})
+.if exists(${DOC_PREFIX}/${LANGCODE}/share/xml/${F})
 XML_INCLUDES+=	${F}
 .endif
-.if exists(${DOC_PREFIX}/share/sgml/${F})
+.if exists(${DOC_PREFIX}/share/xml/${F})
 XML_INCLUDES+=	${F}
 .endif
 .endfor
@@ -58,31 +58,31 @@ DEPENDSET.DEFAULT+=	wwwstd
 _DEPENDSET.transtable=	${XML_TRANSTABLE} ${XSL_TRANSTABLE} \
 			${XSL_TRANSTABLE_MASTER} ${XSL_TRANSTABLE_COMMON}
 _PARAMS.transtable=	--param transtable.xml "'${XML_TRANSTABLE}'"
-XSL_TRANSTABLE_MASTER=	${DOC_PREFIX}/share/sgml/transtable-master.xsl
-XSL_TRANSTABLE_COMMON=	${DOC_PREFIX}/share/sgml/transtable-common.xsl
+XSL_TRANSTABLE_MASTER=	${DOC_PREFIX}/share/xml/transtable-master.xsl
+XSL_TRANSTABLE_COMMON=	${DOC_PREFIX}/share/xml/transtable-common.xsl
 
-.if exists(${DOC_PREFIX}/${LANGCODE}/share/sgml/transtable-local.xsl)
-XSL_TRANSTABLE=		${DOC_PREFIX}/${LANGCODE}/share/sgml/transtable-local.xsl
+.if exists(${DOC_PREFIX}/${LANGCODE}/share/xml/transtable-local.xsl)
+XSL_TRANSTABLE=		${DOC_PREFIX}/${LANGCODE}/share/xml/transtable-local.xsl
 .else
-XSL_TRANSTABLE=		${DOC_PREFIX}/share/sgml/transtable-local.xsl
+XSL_TRANSTABLE=		${DOC_PREFIX}/share/xml/transtable-local.xsl
 .endif
 
-.if exists(${DOC_PREFIX}/${LANGCODE}/share/sgml/transtable.xml)
-XML_TRANSTABLE=		${DOC_PREFIX}/${LANGCODE}/share/sgml/transtable.xml
+.if exists(${DOC_PREFIX}/${LANGCODE}/share/xml/transtable.xml)
+XML_TRANSTABLE=		${DOC_PREFIX}/${LANGCODE}/share/xml/transtable.xml
 .else
-XML_TRANSTABLE=		${DOC_PREFIX}/share/sgml/transtable.xml
+XML_TRANSTABLE=		${DOC_PREFIX}/share/xml/transtable.xml
 .endif
 
 # DEPENDSET: mirrors .....................................................
 _DEPENDSET.mirrors=	${XSL_MIRRORS} ${XML_MIRRORS}
 _PARAMS.mirrors=	--param mirrors.xml "'${XML_MIRRORS}'"
-XML_MIRRORS_MASTER=	${DOC_PREFIX}/share/sgml/mirrors.xml
-XML_MIRRORS=		${DOC_PREFIX}/${LANGCODE}/share/sgml/mirrors.xml
-XSL_MIRRORS_MASTER=	${DOC_PREFIX}/share/sgml/mirrors-master.xsl
-.if exists(${DOC_PREFIX}/${LANGCODE}/share/sgml/mirrors-local.xsl)
-XSL_MIRRORS=		${DOC_PREFIX}/${LANGCODE}/share/sgml/mirrors-local.xsl
+XML_MIRRORS_MASTER=	${DOC_PREFIX}/share/xml/mirrors.xml
+XML_MIRRORS=		${DOC_PREFIX}/${LANGCODE}/share/xml/mirrors.xml
+XSL_MIRRORS_MASTER=	${DOC_PREFIX}/share/xml/mirrors-master.xsl
+.if exists(${DOC_PREFIX}/${LANGCODE}/share/xml/mirrors-local.xsl)
+XSL_MIRRORS=		${DOC_PREFIX}/${LANGCODE}/share/xml/mirrors-local.xsl
 .else
-XSL_MIRRORS=		${DOC_PREFIX}/share/sgml/mirrors-local.xsl
+XSL_MIRRORS=		${DOC_PREFIX}/share/xml/mirrors-local.xsl
 .endif
 ${XSL_MIRRORS}: ${XSL_MIRRORS_MASTER} \
 		${XSL_TRANSTABLE_COMMON}
@@ -120,17 +120,17 @@ _DEPENDSET.usergroups=	${XML_USERGROUPS} ${XML_USERGROUPS_LOCAL} \
 			${XML_INCLUDES}
 _PARAMS.usergroups=	--param usergroups.xml "'${XML_USERGROUPS}'" \
 			--param usergroups-local.xml "'${XML_USERGROUPS_LOCAL}'"
-XML_USERGROUPS=		${DOC_PREFIX}/share/sgml/usergroups.xml
-.if exists(${DOC_PREFIX}/${LANGCODE}/share/sgml/usergroups.xml)
-XML_USERGROUPS_LOCAL=	${DOC_PREFIX}/${LANGCODE}/share/sgml/usergroups.xml
+XML_USERGROUPS=		${DOC_PREFIX}/share/xml/usergroups.xml
+.if exists(${DOC_PREFIX}/${LANGCODE}/share/xml/usergroups.xml)
+XML_USERGROUPS_LOCAL=	${DOC_PREFIX}/${LANGCODE}/share/xml/usergroups.xml
 .else
-XML_USERGROUPS_LOCAL=	${DOC_PREFIX}/share/sgml/usergroups.xml
+XML_USERGROUPS_LOCAL=	${DOC_PREFIX}/share/xml/usergroups.xml
 .endif
-XSL_USERGROUPS_MASTER=	${DOC_PREFIX}/share/sgml/templates.usergroups.xsl
-.if exists(${DOC_PREFIX}/${LANGCODE}/share/sgml/templates.usergroups.xsl)
-XSL_USERGROUPS=	${DOC_PREFIX}/${LANGCODE}/share/sgml/templates.usergroups.xsl
+XSL_USERGROUPS_MASTER=	${DOC_PREFIX}/share/xml/templates.usergroups.xsl
+.if exists(${DOC_PREFIX}/${LANGCODE}/share/xml/templates.usergroups.xsl)
+XSL_USERGROUPS=	${DOC_PREFIX}/${LANGCODE}/share/xml/templates.usergroups.xsl
 .else
-XSL_USERGROUPS=	${DOC_PREFIX}/share/sgml/templates.usergroups.xsl
+XSL_USERGROUPS=	${DOC_PREFIX}/share/xml/templates.usergroups.xsl
 .endif
 
 # DEPENDSET: news ............................................................
@@ -141,17 +141,17 @@ _DEPENDSET.news=	${XML_NEWS_NEWS_MASTER} ${XML_NEWS_NEWS} \
 			${XML_INCLUDES}
 _PARAMS.news=		--param news.project.xml-master "'${XML_NEWS_NEWS_MASTER}'" \
 			--param news.project.xml "'${XML_NEWS_NEWS}'"
-XML_NEWS_NEWS_MASTER=	${DOC_PREFIX}/share/sgml/news.xml
-.if exists(${DOC_PREFIX}/${LANGCODE}/share/sgml/news.xml)
-XML_NEWS_NEWS=		${DOC_PREFIX}/${LANGCODE}/share/sgml/news.xml
+XML_NEWS_NEWS_MASTER=	${DOC_PREFIX}/share/xml/news.xml
+.if exists(${DOC_PREFIX}/${LANGCODE}/share/xml/news.xml)
+XML_NEWS_NEWS=		${DOC_PREFIX}/${LANGCODE}/share/xml/news.xml
 .else
-XML_NEWS_NEWS=		${DOC_PREFIX}/share/sgml/news.xml
+XML_NEWS_NEWS=		${DOC_PREFIX}/share/xml/news.xml
 .endif
 
-XSL_NEWS_NEWSFLASH=	${DOC_PREFIX}/share/sgml/templates.newsflash.xsl
-XSL_NEWS_NEWSFLASH_OLD=	${DOC_PREFIX}/share/sgml/templates.oldnewsflash.xsl
-XSL_NEWS_NEWS_RDF=	${DOC_PREFIX}/share/sgml/templates.news-rdf.xsl
-XSL_NEWS_NEWS_RSS=	${DOC_PREFIX}/share/sgml/templates.news-rss.xsl
+XSL_NEWS_NEWSFLASH=	${DOC_PREFIX}/share/xml/templates.newsflash.xsl
+XSL_NEWS_NEWSFLASH_OLD=	${DOC_PREFIX}/share/xml/templates.oldnewsflash.xsl
+XSL_NEWS_NEWS_RDF=	${DOC_PREFIX}/share/xml/templates.news-rdf.xsl
+XSL_NEWS_NEWS_RSS=	${DOC_PREFIX}/share/xml/templates.news-rss.xsl
 
 # DEPENDSET: press  ..........................................................
 _DEPENDSET.press=	${XML_NEWS_PRESS_MASTER} ${XML_NEWS_PRESS} \
@@ -159,15 +159,15 @@ _DEPENDSET.press=	${XML_NEWS_PRESS_MASTER} ${XML_NEWS_PRESS} \
 			${XML_INCLUDES}
 _PARAMS.press=		--param news.press.xml-master "'${XML_NEWS_PRESS_MASTER}'" \
 			--param news.press.xml "'${XML_NEWS_PRESS}'"
-XML_NEWS_PRESS_MASTER=	${DOC_PREFIX}/share/sgml/press.xml
-.if exists(${DOC_PREFIX}/${LANGCODE}/share/sgml/press.xml)
-XML_NEWS_PRESS=		${DOC_PREFIX}/${LANGCODE}/share/sgml/press.xml
+XML_NEWS_PRESS_MASTER=	${DOC_PREFIX}/share/xml/press.xml
+.if exists(${DOC_PREFIX}/${LANGCODE}/share/xml/press.xml)
+XML_NEWS_PRESS=		${DOC_PREFIX}/${LANGCODE}/share/xml/press.xml
 .else
-XML_NEWS_PRESS=		${DOC_PREFIX}/share/sgml/press.xml
+XML_NEWS_PRESS=		${DOC_PREFIX}/share/xml/press.xml
 .endif
-XSL_NEWS_PRESS=		${DOC_PREFIX}/share/sgml/templates.press.xsl
-XSL_NEWS_PRESS_RSS=	${DOC_PREFIX}/share/sgml/templates.press-rss.xsl
-XSL_NEWS_PRESS_OLD=	${DOC_PREFIX}/share/sgml/templates.oldpress.xsl
+XSL_NEWS_PRESS=		${DOC_PREFIX}/share/xml/templates.press.xsl
+XSL_NEWS_PRESS_RSS=	${DOC_PREFIX}/share/xml/templates.press-rss.xsl
+XSL_NEWS_PRESS_OLD=	${DOC_PREFIX}/share/xml/templates.oldpress.xsl
 
 # DEPENDSET: events  ..........................................................
 _DEPENDSET.events=	${XML_EVENTS_EVENTS_MASTER} ${XML_EVENTS_EVENTS} \
@@ -178,25 +178,25 @@ _DEPENDSET.events=	${XML_EVENTS_EVENTS_MASTER} ${XML_EVENTS_EVENTS} \
 			${XML_INCLUDES}
 _PARAMS.events=		--param events.xml-master "'${XML_EVENTS_EVENTS_MASTER}'" \
 			--param events.xml "'${XML_EVENTS_EVENTS}'"
-XML_EVENTS_EVENTS_MASTER=${DOC_PREFIX}/share/sgml/events.xml
+XML_EVENTS_EVENTS_MASTER=${DOC_PREFIX}/share/xml/events.xml
 XML_EVENTS_EVENTS_MASTER_SUBFILES=
 .for Y in 2003 2004 2005 2006 2007 2008 2009 2010 2011 2012 2013
-XML_EVENTS_EVENTS_MASTER_SUBFILES+=	${DOC_PREFIX}/share/sgml/events${Y}.xml
+XML_EVENTS_EVENTS_MASTER_SUBFILES+=	${DOC_PREFIX}/share/xml/events${Y}.xml
 .endfor
-.if exists(${DOC_PREFIX}/${LANGCODE}/share/sgml/events.xml)
-XML_EVENTS_EVENTS=	${DOC_PREFIX}/${LANGCODE}/share/sgml/events.xml
+.if exists(${DOC_PREFIX}/${LANGCODE}/share/xml/events.xml)
+XML_EVENTS_EVENTS=	${DOC_PREFIX}/${LANGCODE}/share/xml/events.xml
 .else
 XML_EVENTS_EVENTS=	${XML_EVENTS_EVENTS_MASTER}
 .endif
 XML_EVENTS_EVENTS_SUBFILES=
 .for Y in 2003 2004 2005 2006 2007 2008 2009 2010 2011 2012 2013
-.if exists(${DOC_PREFIX}/${LANGCODE}/share/sgml/events${Y}.xml)
-XML_EVENTS_EVENTS_SUBFILES+=	${DOC_PREFIX}/${LANGCODE}/share/sgml/events${Y}.xml
+.if exists(${DOC_PREFIX}/${LANGCODE}/share/xml/events${Y}.xml)
+XML_EVENTS_EVENTS_SUBFILES+=	${DOC_PREFIX}/${LANGCODE}/share/xml/events${Y}.xml
 .endif
 .endfor
-XSL_EVENTS=		${DOC_PREFIX}/share/sgml/templates.events.xsl
-XSL_EVENTS_ICS=		${DOC_PREFIX}/share/sgml/templates.events2ics.xsl
-XSL_EVENTS_PAST=	${DOC_PREFIX}/share/sgml/templates.pastevents.xsl
+XSL_EVENTS=		${DOC_PREFIX}/share/xml/templates.events.xsl
+XSL_EVENTS_ICS=		${DOC_PREFIX}/share/xml/templates.events2ics.xsl
+XSL_EVENTS_PAST=	${DOC_PREFIX}/share/xml/templates.pastevents.xsl
 
 # DEPENDSET: commercial ........................................................
 _DEPENDSET.commercial=	${XML_COMMERCIAL_CONSULT} \
@@ -207,23 +207,23 @@ _DEPENDSET.commercial=	${XML_COMMERCIAL_CONSULT} \
 			${XSL_ENTRIES} \
 			${XML_INCLUDES}
 _PARAMS.commercial=
-XML_COMMERCIAL_CONSULT=	${DOC_PREFIX}/share/sgml/commercial.consult.xml
-XML_COMMERCIAL_HARDWARE=${DOC_PREFIX}/share/sgml/commercial.hardware.xml
-XML_COMMERCIAL_ISP=	${DOC_PREFIX}/share/sgml/commercial.isp.xml
-XML_COMMERCIAL_MISC=	${DOC_PREFIX}/share/sgml/commercial.misc.xml
-XML_COMMERCIAL_SOFTWARE=${DOC_PREFIX}/share/sgml/commercial.software.xml
+XML_COMMERCIAL_CONSULT=	${DOC_PREFIX}/share/xml/commercial.consult.xml
+XML_COMMERCIAL_HARDWARE=${DOC_PREFIX}/share/xml/commercial.hardware.xml
+XML_COMMERCIAL_ISP=	${DOC_PREFIX}/share/xml/commercial.isp.xml
+XML_COMMERCIAL_MISC=	${DOC_PREFIX}/share/xml/commercial.misc.xml
+XML_COMMERCIAL_SOFTWARE=${DOC_PREFIX}/share/xml/commercial.software.xml
 
-XSL_ENTRIES=		${DOC_PREFIX}/share/sgml/templates.entries.xsl
+XSL_ENTRIES=		${DOC_PREFIX}/share/xml/templates.entries.xsl
 
 # DEPENDSET: advisories  .....................................................
 _DEPENDSET.advisories=	${XML_ADVISORIES} ${XML_INCLUDES}
 _PARAMS.advisories=	--param advisories.xml "'${XML_ADVISORIES}'"
-XML_ADVISORIES=		${DOC_PREFIX}/share/sgml/advisories.xml
+XML_ADVISORIES=		${DOC_PREFIX}/share/xml/advisories.xml
 
 # DEPENDSET: notices  ........................................................
 _DEPENDSET.notices=	${XML_NOTICES} ${XML_INCLUDES}
 _PARAMS.notices=	--param notices.xml "'${XML_NOTICES}'"
-XML_NOTICES=		${DOC_PREFIX}/share/sgml/notices.xml
+XML_NOTICES=		${DOC_PREFIX}/share/xml/notices.xml
 
 # ---
 # .xml -> .html rendering rule
diff --git a/share/mk/web.site.mk b/share/mk/web.site.mk
index d3ae084be0..bb4cde735d 100644
--- a/share/mk/web.site.mk
+++ b/share/mk/web.site.mk
@@ -145,20 +145,20 @@ _INCLIST=	navibar.ent \
 _SGML_INCLUDES=	${SGML_INCLUDES}
 
 .for F in ${_INCLIST}
-.if exists(${DOC_PREFIX}/${LANGCODE}/share/sgml/${F})
-_SGML_INCLUDES+=${DOC_PREFIX}/${LANGCODE}/share/sgml/${F}
+.if exists(${DOC_PREFIX}/${LANGCODE}/share/xml/${F})
+_SGML_INCLUDES+=${DOC_PREFIX}/${LANGCODE}/share/xml/${F}
 .endif
-.if exists(${DOC_PREFIX}/share/sgml/${F})
-_SGML_INCLUDES+=${DOC_PREFIX}/share/sgml/${F}
+.if exists(${DOC_PREFIX}/share/xml/${F})
+_SGML_INCLUDES+=${DOC_PREFIX}/share/xml/${F}
 .endif
 .endfor
 
-CATALOG?=	${PREFIX}/share/sgml/html/catalog \
-		${PREFIX}/share/sgml/catalog
-.if exists(${DOC_PREFIX}/${LANGCODE}/share/sgml/catalog)
-CATALOG+=	${DOC_PREFIX}/${LANGCODE}/share/sgml/catalog
+CATALOG?=	${PREFIX}/share/xml/html/catalog \
+		${PREFIX}/share/xml/catalog
+.if exists(${DOC_PREFIX}/${LANGCODE}/share/xml/catalog)
+CATALOG+=	${DOC_PREFIX}/${LANGCODE}/share/xml/catalog
 .endif
-CATALOG+=	${DOC_PREFIX}/share/sgml/catalog
+CATALOG+=	${DOC_PREFIX}/share/xml/catalog
 
 ##################################################################
 # Transformation rules
@@ -190,16 +190,16 @@ PREHTML?=	${SED} -e 's/<!ENTITY base CDATA ".*">/<!ENTITY base CDATA "http:\/\/w
 GENDOCS+=	${DOCS:M*.xml:S/.xml$/.html/g}
 ORPHANS:=	${ORPHANS:N*.xml}
 
-.xml.html: ${_DEPENDSET.wwwstd} ${DOC_PREFIX}/share/sgml/xhtml.xsl
+.xml.html: ${_DEPENDSET.wwwstd} ${DOC_PREFIX}/share/xml/xhtml.xsl
 .if defined(PREHTML)
 	${PREHTML} ${PREHTMLOPTS} ${.IMPSRC} > ${.IMPSRC}-tmp
 	${XMLLINT} ${XMLLINTOPTS} ${.IMPSRC}-tmp
-	${XSLTPROC} ${XSLTPROCOPTS} --debug -o ${.TARGET} ${DOC_PREFIX}/share/sgml/xhtml.xsl ${.IMPSRC}-tmp || \
+	${XSLTPROC} ${XSLTPROCOPTS} --debug -o ${.TARGET} ${DOC_PREFIX}/share/xml/xhtml.xsl ${.IMPSRC}-tmp || \
 			(${RM} -f ${.IMPSRC}-tmp ${.TARGET} && false)
 	${RM} -f ${.IMPSRC}-tmp
 .else
 	${XMLLINT} ${XMLLINTOPTS} ${.IMPSRC}
-	${XSLTPROC} ${XSLTPROCOPTS} --debug -o ${.TARGET} ${DOC_PREFIX}/share/sgml/xhtml.xsl ${.IMPSRC}
+	${XSLTPROC} ${XSLTPROCOPTS} --debug -o ${.TARGET} ${DOC_PREFIX}/share/xml/xhtml.xsl ${.IMPSRC}
 .endif
 
 ##################################################################
diff --git a/share/sgml/README.mirrors b/share/xml/README.mirrors
index d4fec6c6cb..64bdb44116 100644
--- a/share/sgml/README.mirrors
+++ b/share/xml/README.mirrors
@@ -23,23 +23,23 @@ for both of www/ and doc/ tree:
 * Notes for doc/ and www/ maintainers including translation teams:
 
   Translators should not simply copy mirrors.xml, mirrors-*.xsl,
-  transtable.xml, and transtable-*.xsl in share/sgml to the
+  transtable.xml, and transtable-*.xsl in share/xml to the
   language dependent directory.  Instead, create "skeleton" *.xsl,
-  which just import the master stylesheet.  *-local.xsl in share/sgml
+  which just import the master stylesheet.  *-local.xsl in share/xml
   are "skeleton" for en_US.ISO8859-1, so you can start from these.
   See ja_JP.eucJP/ for example.
 
   Documents always use mirrors.xml in the language dependent directory.
-  This file is dynamically generated from share/sgml/mirrors.xml, and it
+  This file is dynamically generated from share/xml/mirrors.xml, and it
   is localized using transtable-local.xsl.  transtable-local.xsl refers
   transtable.xml, a translation table for translating country name and
   so on.  It should be in the language dependent directory, but if not exist,
-  share/sgml/transtable.xml (a dummy translation table) will be used.
+  share/xml/transtable.xml (a dummy translation table) will be used.
   Similarly, if there is no mirrors-local.xsl in the language dependent
-  directory, share/sgml/mirrors-local.xsl will be used.
+  directory, share/xml/mirrors-local.xsl will be used.
 
   That is:
-                          share/sgml           <langcode>/share/sgml
+                          share/xml           <langcode>/share/xml
   -----------------------------------------------------------------------
    mirrors.xml            master copy           dynamically generated
    mirrors-local.xsl      dummy                 this is used if exists
diff --git a/share/sgml/advisories.xml b/share/xml/advisories.xml
index d7e983b30e..d7e983b30e 100644
--- a/share/sgml/advisories.xml
+++ b/share/xml/advisories.xml
diff --git a/share/sgml/authors.ent b/share/xml/authors.ent
index e4851598e9..e4851598e9 100644
--- a/share/sgml/authors.ent
+++ b/share/xml/authors.ent
diff --git a/share/sgml/bibliography.xml b/share/xml/bibliography.xml
index 71900a016b..71900a016b 100644
--- a/share/sgml/bibliography.xml
+++ b/share/xml/bibliography.xml
diff --git a/share/sgml/catalog b/share/xml/catalog
index 9f653f635d..a88f2bd23e 100644
--- a/share/sgml/catalog
+++ b/share/xml/catalog
@@ -110,16 +110,16 @@ PUBLIC "-//FreeBSD//ENTITIES HTML FreeBSD Navigation Bar Entities//EN"
   --
 
 PUBLIC  "-//FreeBSD//ENTITIES DocBook Author Entities//EN"
-        "../../en_US.ISO8859-1/share/sgml/authors.ent"
+        "../../en_US.ISO8859-1/share/xml/authors.ent"
 
 PUBLIC  "-//FreeBSD//ENTITIES DocBook Team Entities//EN"
-        "../../en_US.ISO8859-1/share/sgml/teams.ent"
+        "../../en_US.ISO8859-1/share/xml/teams.ent"
 
 PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//EN"
-	"../../en_US.ISO8859-1/share/sgml/glossary.ent"
+	"../../en_US.ISO8859-1/share/xml/glossary.ent"
 
 PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//EN"
-        "../../en_US.ISO8859-1/share/sgml/mailing-lists.ent"
+        "../../en_US.ISO8859-1/share/xml/mailing-lists.ent"
 
 PUBLIC  "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//EN"
-        "../../en_US.ISO8859-1/share/sgml/newsgroups.ent"
+        "../../en_US.ISO8859-1/share/xml/newsgroups.ent"
diff --git a/share/sgml/catalog-cwd.xml b/share/xml/catalog-cwd.xml
index 1cc515a9a9..1cc515a9a9 100644
--- a/share/sgml/catalog-cwd.xml
+++ b/share/xml/catalog-cwd.xml
diff --git a/share/sgml/catalog.xml b/share/xml/catalog.xml
index 7dd342c033..7dd342c033 100644
--- a/share/sgml/catalog.xml
+++ b/share/xml/catalog.xml
diff --git a/share/sgml/commercial.consult.xml b/share/xml/commercial.consult.xml
index 80477eaabe..ff7486a9f7 100644
--- a/share/sgml/commercial.consult.xml
+++ b/share/xml/commercial.consult.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE entries PUBLIC "-//FreeBSD//DTD FreeBSD XML Database for Commercial Gallery//EN"
-                         "http://www.FreeBSD.org/XML/www/share/sgml/gallery.dtd">
+                         "http://www.FreeBSD.org/XML/www/share/xml/gallery.dtd">
 <!-- $FreeBSD$ -->
 
 <entries>
diff --git a/share/sgml/commercial.hardware.xml b/share/xml/commercial.hardware.xml
index 1824e2c4ac..2d1f68e4e6 100644
--- a/share/sgml/commercial.hardware.xml
+++ b/share/xml/commercial.hardware.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE entries PUBLIC "-//FreeBSD//DTD FreeBSD XML Database for Commercial Gallery//EN"
-                         "http://www.FreeBSD.org/XML/www/share/sgml/gallery.dtd">
+                         "http://www.FreeBSD.org/XML/www/share/xml/gallery.dtd">
 <!-- $FreeBSD$ -->
 
 <entries>
diff --git a/share/sgml/commercial.isp.xml b/share/xml/commercial.isp.xml
index ce57c6969d..51ea8a5552 100644
--- a/share/sgml/commercial.isp.xml
+++ b/share/xml/commercial.isp.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE entries PUBLIC "-//FreeBSD//DTD FreeBSD XML Database for Commercial Gallery//EN"
-                            "http://www.FreeBSD.org/XML/www/share/sgml/gallery.dtd">
+                            "http://www.FreeBSD.org/XML/www/share/xml/gallery.dtd">
 <!-- $FreeBSD$ -->
 
 <entries>
diff --git a/share/sgml/commercial.misc.xml b/share/xml/commercial.misc.xml
index 07bce8d54d..4ce766a0a8 100644
--- a/share/sgml/commercial.misc.xml
+++ b/share/xml/commercial.misc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE entries PUBLIC "-//FreeBSD//DTD FreeBSD XML Database for Commercial Gallery//EN"
-                         "http://www.FreeBSD.org/XML/www/share/sgml/gallery.dtd">
+                         "http://www.FreeBSD.org/XML/www/share/xml/gallery.dtd">
 <!-- $FreeBSD$ -->
 
 <entries>
diff --git a/share/sgml/commercial.software.xml b/share/xml/commercial.software.xml
index 3d43ba2eb3..a83c4ee04c 100644
--- a/share/sgml/commercial.software.xml
+++ b/share/xml/commercial.software.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE entries PUBLIC "-//FreeBSD//DTD FreeBSD XML Database for Commercial Gallery//EN"
-                         "http://www.FreeBSD.org/XML/www/share/sgml/gallery.dtd">
+                         "http://www.FreeBSD.org/XML/www/share/xml/gallery.dtd">
 <!-- $FreeBSD$ -->
 
 <entries>
diff --git a/share/sgml/common.ent b/share/xml/common.ent
index 919430b74a..919430b74a 100644
--- a/share/sgml/common.ent
+++ b/share/xml/common.ent
diff --git a/share/sgml/cvs.dtd b/share/xml/cvs.dtd
index 219505d76d..219505d76d 100644
--- a/share/sgml/cvs.dtd
+++ b/share/xml/cvs.dtd
diff --git a/share/sgml/default.dsl b/share/xml/default.dsl
index bd71d2f0d3..bd71d2f0d3 100644
--- a/share/sgml/default.dsl
+++ b/share/xml/default.dsl
diff --git a/share/sgml/developers.ent b/share/xml/developers.ent
index fe7a3e395f..fe7a3e395f 100644
--- a/share/sgml/developers.ent
+++ b/share/xml/developers.ent
diff --git a/share/sgml/entities.ent b/share/xml/entities.ent
index e02fd438f9..e02fd438f9 100644
--- a/share/sgml/entities.ent
+++ b/share/xml/entities.ent
diff --git a/share/sgml/events.dtd b/share/xml/events.dtd
index 3e2e7753ee..06ae89004d 100644
--- a/share/sgml/events.dtd
+++ b/share/xml/events.dtd
@@ -76,7 +76,7 @@
 
 <!ENTITY % cvs
  PUBLIC "-//FreeBSD//DTD FreeBSD CVS Keywords//EN"
-	"http://www.FreeBSD.org/XML/doc/share/sgml/cvs.dtd">
+	"http://www.FreeBSD.org/XML/doc/share/xml/cvs.dtd">
 %cvs;
 
 <!ENTITY % autogen.ent
@@ -86,15 +86,15 @@
 
 <!ENTITY % iso8879.ent
  PUBLIC "-//FreeBSD//ENTITIES ISO 8879:1986 Entity Set//EN//XML"
-        "http://www.FreeBSD.org/XML/www/share/sgml/iso8879.ent">
+        "http://www.FreeBSD.org/XML/www/share/xml/iso8879.ent">
 %iso8879.ent;
 
 <!ENTITY % l10n.ent
  PUBLIC "-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
-        "http://www.FreeBSD.org/XML/www/share/sgml/l10n.ent">
+        "http://www.FreeBSD.org/XML/www/share/xml/l10n.ent">
 %l10n.ent;
 
 <!ENTITY % common.ent
  PUBLIC "-//FreeBSD//ENTITIES FreeBSD Common Entities//EN"
-        "http://www.FreeBSD.org/XML/www/share/sgml/common.ent">
+        "http://www.FreeBSD.org/XML/www/share/xml/common.ent">
 %common.ent;
diff --git a/share/sgml/events.xml b/share/xml/events.xml
index 0695d1e53f..9c7e35456a 100644
--- a/share/sgml/events.xml
+++ b/share/xml/events.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE events PUBLIC "-//FreeBSD//DTD FreeBSD XML Database for Events//EN"
-                        "http://www.FreeBSD.org/XML/www/share/sgml/events.dtd">
+                        "http://www.FreeBSD.org/XML/www/share/xml/events.dtd">
 <!--
      Events which might be interesting for FreeBSD users.
 
@@ -13,46 +13,46 @@
     </cvs:keyword>
 
   <xi:include
-    href="http://www.FreeBSD.org/XML/www/share/sgml/events2013.xml"
+    href="http://www.FreeBSD.org/XML/www/share/xml/events2013.xml"
     xpointer="xpointer(//event)" />
 
   <xi:include
-    href="http://www.FreeBSD.org/XML/www/share/sgml/events2012.xml"
+    href="http://www.FreeBSD.org/XML/www/share/xml/events2012.xml"
     xpointer="xpointer(//event)" />
 
   <xi:include
-    href="http://www.FreeBSD.org/XML/www/share/sgml/events2011.xml"
+    href="http://www.FreeBSD.org/XML/www/share/xml/events2011.xml"
     xpointer="xpointer(//event)" />
 
   <xi:include
-    href="http://www.FreeBSD.org/XML/www/share/sgml/events2010.xml"
+    href="http://www.FreeBSD.org/XML/www/share/xml/events2010.xml"
     xpointer="xpointer(//event)" />
 
   <xi:include
-    href="http://www.FreeBSD.org/XML/www/share/sgml/events2009.xml"
+    href="http://www.FreeBSD.org/XML/www/share/xml/events2009.xml"
     xpointer="xpointer(//event)" />
 
   <xi:include
-    href="http://www.FreeBSD.org/XML/www/share/sgml/events2008.xml"
+    href="http://www.FreeBSD.org/XML/www/share/xml/events2008.xml"
     xpointer="xpointer(//event)" />
 
   <xi:include
-    href="http://www.FreeBSD.org/XML/www/share/sgml/events2007.xml"
+    href="http://www.FreeBSD.org/XML/www/share/xml/events2007.xml"
     xpointer="xpointer(//event)" />
 
   <xi:include
-    href="http://www.FreeBSD.org/XML/www/share/sgml/events2006.xml"
+    href="http://www.FreeBSD.org/XML/www/share/xml/events2006.xml"
     xpointer="xpointer(//event)" />
 
   <xi:include
-    href="http://www.FreeBSD.org/XML/www/share/sgml/events2005.xml"
+    href="http://www.FreeBSD.org/XML/www/share/xml/events2005.xml"
     xpointer="xpointer(//event)" />
 
   <xi:include
-    href="http://www.FreeBSD.org/XML/www/share/sgml/events2004.xml"
+    href="http://www.FreeBSD.org/XML/www/share/xml/events2004.xml"
     xpointer="xpointer(//event)" />
 
   <xi:include
-    href="http://www.FreeBSD.org/XML/www/share/sgml/events2003.xml"
+    href="http://www.FreeBSD.org/XML/www/share/xml/events2003.xml"
     xpointer="xpointer(//event)" />
 </events>
diff --git a/share/sgml/events2003.xml b/share/xml/events2003.xml
index b3354b7ee2..ee07375fdf 100644
--- a/share/sgml/events2003.xml
+++ b/share/xml/events2003.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE events PUBLIC "-//FreeBSD//DTD FreeBSD XML Database for Events//EN"
-                        "http://www.FreeBSD.org/XML/www/share/sgml/events.dtd">
+                        "http://www.FreeBSD.org/XML/www/share/xml/events.dtd">
 <!--
      Events which might be interesting for FreeBSD users.
 
diff --git a/share/sgml/events2004.xml b/share/xml/events2004.xml
index 8855e4aa65..f3b5836899 100644
--- a/share/sgml/events2004.xml
+++ b/share/xml/events2004.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE events PUBLIC "-//FreeBSD//DTD FreeBSD XML Database for Events//EN"
-                        "http://www.FreeBSD.org/XML/www/share/sgml/events.dtd">
+                        "http://www.FreeBSD.org/XML/www/share/xml/events.dtd">
 <!--
      Events which might be interesting for FreeBSD users.
 
diff --git a/share/sgml/events2005.xml b/share/xml/events2005.xml
index 644100da29..508bab3415 100644
--- a/share/sgml/events2005.xml
+++ b/share/xml/events2005.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE events PUBLIC "-//FreeBSD//DTD FreeBSD XML Database for Events//EN"
-                        "http://www.FreeBSD.org/XML/www/share/sgml/events.dtd">
+                        "http://www.FreeBSD.org/XML/www/share/xml/events.dtd">
 <!--
      Events which might be interesting for FreeBSD users.
 
diff --git a/share/sgml/events2006.xml b/share/xml/events2006.xml
index 504d637d13..3029bfcd7c 100644
--- a/share/sgml/events2006.xml
+++ b/share/xml/events2006.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE events PUBLIC "-//FreeBSD//DTD FreeBSD XML Database for Events//EN"
-                        "http://www.FreeBSD.org/XML/www/share/sgml/events.dtd">
+                        "http://www.FreeBSD.org/XML/www/share/xml/events.dtd">
 <!--
      Events which might be interesting for FreeBSD users.
 
diff --git a/share/sgml/events2007.xml b/share/xml/events2007.xml
index 90e0113ca8..1bd565fa72 100644
--- a/share/sgml/events2007.xml
+++ b/share/xml/events2007.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE events PUBLIC "-//FreeBSD//DTD FreeBSD XML Database for Events//EN"
-                        "http://www.FreeBSD.org/XML/www/share/sgml/events.dtd">
+                        "http://www.FreeBSD.org/XML/www/share/xml/events.dtd">
 <!--
      Events which might be interesting for FreeBSD users.
 
diff --git a/share/sgml/events2008.xml b/share/xml/events2008.xml
index 537b963678..ad3b13739c 100644
--- a/share/sgml/events2008.xml
+++ b/share/xml/events2008.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE events PUBLIC "-//FreeBSD//DTD FreeBSD XML Database for Events//EN"
-                        "http://www.FreeBSD.org/XML/www/share/sgml/events.dtd">
+                        "http://www.FreeBSD.org/XML/www/share/xml/events.dtd">
 <!--
      Events which might be interesting for FreeBSD users.
 
diff --git a/share/sgml/events2009.xml b/share/xml/events2009.xml
index 1a998698cd..3bd32066e8 100644
--- a/share/sgml/events2009.xml
+++ b/share/xml/events2009.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE events PUBLIC "-//FreeBSD//DTD FreeBSD XML Database for Events//EN"
-                        "http://www.FreeBSD.org/XML/www/share/sgml/events.dtd">
+                        "http://www.FreeBSD.org/XML/www/share/xml/events.dtd">
 <!--
      Events which might be interesting for FreeBSD users.
 
diff --git a/share/sgml/events2010.xml b/share/xml/events2010.xml
index dd635e35d8..b178670637 100644
--- a/share/sgml/events2010.xml
+++ b/share/xml/events2010.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE events PUBLIC "-//FreeBSD//DTD FreeBSD XML Database for Events//EN"
-                        "http://www.FreeBSD.org/XML/www/share/sgml/events.dtd">
+                        "http://www.FreeBSD.org/XML/www/share/xml/events.dtd">
 <!--
      Events which might be interesting for FreeBSD users.
 
diff --git a/share/sgml/events2011.xml b/share/xml/events2011.xml
index 3ef4a644fb..6a31c432ec 100644
--- a/share/sgml/events2011.xml
+++ b/share/xml/events2011.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE events PUBLIC "-//FreeBSD//DTD FreeBSD XML Database for Events//EN"
-                        "http://www.FreeBSD.org/XML/www/share/sgml/events.dtd">
+                        "http://www.FreeBSD.org/XML/www/share/xml/events.dtd">
 <!--
      Events which might be interesting for FreeBSD users.
 
diff --git a/share/sgml/events2012.xml b/share/xml/events2012.xml
index 292d94c67e..b20f156a55 100644
--- a/share/sgml/events2012.xml
+++ b/share/xml/events2012.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE events PUBLIC "-//FreeBSD//DTD FreeBSD XML Database for Events//EN"
-                        "http://www.FreeBSD.org/XML/www/share/sgml/events.dtd">
+                        "http://www.FreeBSD.org/XML/www/share/xml/events.dtd">
 <!--
      Events which might be interesting for FreeBSD users.
 
diff --git a/share/sgml/events2013.xml b/share/xml/events2013.xml
index 254ea8e4e7..cf4fd71359 100644
--- a/share/sgml/events2013.xml
+++ b/share/xml/events2013.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE events PUBLIC "-//FreeBSD//DTD FreeBSD XML Database for Events//EN"
-                        "http://www.FreeBSD.org/XML/www/share/sgml/events.dtd">
+                        "http://www.FreeBSD.org/XML/www/share/xml/events.dtd">
 <!--
      Events which might be interesting for FreeBSD users.
 
diff --git a/share/sgml/freebsd-common.dsl b/share/xml/freebsd-common.dsl
index 7a98397c4e..7a98397c4e 100644
--- a/share/sgml/freebsd-common.dsl
+++ b/share/xml/freebsd-common.dsl
diff --git a/share/sgml/freebsd-html.dsl b/share/xml/freebsd-html.dsl
index a59596cd6c..a59596cd6c 100644
--- a/share/sgml/freebsd-html.dsl
+++ b/share/xml/freebsd-html.dsl
diff --git a/share/sgml/freebsd-print.dsl b/share/xml/freebsd-print.dsl
index ec691517d6..ec691517d6 100644
--- a/share/sgml/freebsd-print.dsl
+++ b/share/xml/freebsd-print.dsl
diff --git a/share/sgml/freebsd.dsl b/share/xml/freebsd.dsl
index ee0bda0923..ee0bda0923 100644
--- a/share/sgml/freebsd.dsl
+++ b/share/xml/freebsd.dsl
diff --git a/share/sgml/freebsd.dtd b/share/xml/freebsd.dtd
index ee4b6f8b7c..ee4b6f8b7c 100644
--- a/share/sgml/freebsd.dtd
+++ b/share/xml/freebsd.dtd
diff --git a/share/sgml/freebsd.ent b/share/xml/freebsd.ent
index 3c0bec09f9..3c0bec09f9 100644
--- a/share/sgml/freebsd.ent
+++ b/share/xml/freebsd.ent
diff --git a/share/sgml/freebsd42.dtd b/share/xml/freebsd42.dtd
index e86f9cc16b..e86f9cc16b 100644
--- a/share/sgml/freebsd42.dtd
+++ b/share/xml/freebsd42.dtd
diff --git a/share/sgml/gallery.dtd b/share/xml/gallery.dtd
index 0a5ce8569c..33d8f4e05e 100644
--- a/share/sgml/gallery.dtd
+++ b/share/xml/gallery.dtd
@@ -33,7 +33,7 @@
 
 <!ENTITY % cvs
  PUBLIC "-//FreeBSD//DTD FreeBSD CVS Keywords//EN"
-	"http://www.FreeBSD.org/XML/doc/share/sgml/cvs.dtd">
+	"http://www.FreeBSD.org/XML/doc/share/xml/cvs.dtd">
 %cvs;
 
 <!ENTITY % autogen.ent
@@ -43,15 +43,15 @@
 
 <!ENTITY % iso8879.ent
  PUBLIC "-//FreeBSD//ENTITIES ISO 8879:1986 Entity Set//EN//XML"
-        "http://www.FreeBSD.org/XML/www/share/sgml/iso8879.ent">
+        "http://www.FreeBSD.org/XML/www/share/xml/iso8879.ent">
 %iso8879.ent;
 
 <!ENTITY % l10n.ent
  PUBLIC "-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
-        "http://www.FreeBSD.org/XML/www/share/sgml/l10n.ent">
+        "http://www.FreeBSD.org/XML/www/share/xml/l10n.ent">
 %l10n.ent;
 
 <!ENTITY % common.ent
  PUBLIC "-//FreeBSD//ENTITIES FreeBSD Common Entities//EN"
-        "http://www.FreeBSD.org/XML/www/share/sgml/common.ent">
+        "http://www.FreeBSD.org/XML/www/share/xml/common.ent">
 %common.ent;
diff --git a/share/sgml/header.ent b/share/xml/header.ent
index bb36ef0e01..bb36ef0e01 100644
--- a/share/sgml/header.ent
+++ b/share/xml/header.ent
diff --git a/share/sgml/header.l10n.ent b/share/xml/header.l10n.ent
index ce4c20a141..ce4c20a141 100644
--- a/share/sgml/header.l10n.ent
+++ b/share/xml/header.l10n.ent
diff --git a/share/sgml/html401-freebsd.dtd b/share/xml/html401-freebsd.dtd
index dcf9282dc7..dcf9282dc7 100644
--- a/share/sgml/html401-freebsd.dtd
+++ b/share/xml/html401-freebsd.dtd
diff --git a/share/sgml/ideas.dtd b/share/xml/ideas.dtd
index 34b0b38d8a..a99137ca97 100644
--- a/share/sgml/ideas.dtd
+++ b/share/xml/ideas.dtd
@@ -24,7 +24,7 @@
 
 <!ENTITY % cvs
  PUBLIC "-//FreeBSD//DTD FreeBSD CVS Keywords//EN"
-	"http://www.FreeBSD.org/XML/doc/share/sgml/cvs.dtd">
+	"http://www.FreeBSD.org/XML/doc/share/xml/cvs.dtd">
 %cvs;
 
 <!ENTITY % autogen.ent
@@ -34,17 +34,17 @@
 
 <!ENTITY % iso8879.ent
  PUBLIC "-//FreeBSD//ENTITIES ISO 8879:1986 Entity Set//EN//XML"
-        "http://www.FreeBSD.org/XML/www/share/sgml/iso8879.ent">
+        "http://www.FreeBSD.org/XML/www/share/xml/iso8879.ent">
 %iso8879.ent;
 
 <!ENTITY % l10n.ent
  PUBLIC "-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
-        "http://www.FreeBSD.org/XML/www/lang/share/sgml/l10n.ent">
+        "http://www.FreeBSD.org/XML/www/lang/share/xml/l10n.ent">
 %l10n.ent;
 
 <!ENTITY % l10n-common.ent
  PUBLIC "-//FreeBSD//ENTITIES FreeBSD L10N Common Entities//EN"
-        "http://www.FreeBSD.org/XML/www/share/sgml/l10n.ent">
+        "http://www.FreeBSD.org/XML/www/share/xml/l10n.ent">
 %l10n-common.ent;
 
 <!ENTITY % common.ent
diff --git a/share/sgml/iso8879.ent b/share/xml/iso8879.ent
index eeef902dcc..eeef902dcc 100644
--- a/share/sgml/iso8879.ent
+++ b/share/xml/iso8879.ent
diff --git a/share/sgml/l10n.ent b/share/xml/l10n.ent
index d78270303c..d78270303c 100644
--- a/share/sgml/l10n.ent
+++ b/share/xml/l10n.ent
diff --git a/share/sgml/libcommon.xsl b/share/xml/libcommon.xsl
index 2f5d8db57e..ec6dab29f7 100644
--- a/share/sgml/libcommon.xsl
+++ b/share/xml/libcommon.xsl
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1" ?>
 <!DOCTYPE xsl:stylesheet PUBLIC "-//FreeBSD//DTD FreeBSD XSLT 1.0 DTD//EN"
-				"http://www.FreeBSD.org/XML/www/share/sgml/xslt10-freebsd.dtd">
+				"http://www.FreeBSD.org/XML/www/share/xml/xslt10-freebsd.dtd">
 <!-- $FreeBSD$ -->
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
diff --git a/share/sgml/man-refs.ent b/share/xml/man-refs.ent
index c8513beea1..c8513beea1 100644
--- a/share/sgml/man-refs.ent
+++ b/share/xml/man-refs.ent
diff --git a/share/sgml/man-refs.pl b/share/xml/man-refs.pl
index 48d96b6421..48d96b6421 100644
--- a/share/sgml/man-refs.pl
+++ b/share/xml/man-refs.pl
diff --git a/share/sgml/mirrors-local.xsl b/share/xml/mirrors-local.xsl
index 786463bdeb..bc2b37d047 100644
--- a/share/sgml/mirrors-local.xsl
+++ b/share/xml/mirrors-local.xsl
@@ -3,7 +3,7 @@
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
 
-  <!-- must point to master copy, doc/share/sgml/mirrors-master.xsl -->
+  <!-- must point to master copy, doc/share/xml/mirrors-master.xsl -->
   <xsl:import href="./mirrors-master.xsl" />
 
   <xsl:output type="xml" encoding="iso-8859-1"
diff --git a/share/sgml/mirrors-master.xsl b/share/xml/mirrors-master.xsl
index 4eed64c5a1..4eed64c5a1 100644
--- a/share/sgml/mirrors-master.xsl
+++ b/share/xml/mirrors-master.xsl
diff --git a/share/sgml/mirrors.xml b/share/xml/mirrors.xml
index bcf2c76f61..bcf2c76f61 100644
--- a/share/sgml/mirrors.xml
+++ b/share/xml/mirrors.xml
diff --git a/share/sgml/multimedia.dtd b/share/xml/multimedia.dtd
index 84d56e9ba2..e4cb7fd9fa 100644
--- a/share/sgml/multimedia.dtd
+++ b/share/xml/multimedia.dtd
@@ -33,22 +33,22 @@
 
 <!ENTITY % iso8879.ent
  PUBLIC "-//FreeBSD//ENTITIES ISO 8879:1986 Entity Set//EN//XML"
-        "http://www.FreeBSD.org/XML/www/share/sgml/iso8879.ent">
+        "http://www.FreeBSD.org/XML/www/share/xml/iso8879.ent">
 %iso8879.ent;
 
 <!ENTITY % l10n.ent
  PUBLIC "-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
-        "http://www.FreeBSD.org/XML/www/lang/share/sgml/l10n.ent">
+        "http://www.FreeBSD.org/XML/www/lang/share/xml/l10n.ent">
 %l10n.ent;
 
 <!ENTITY % l10n-common.ent
  PUBLIC "-//FreeBSD//ENTITIES FreeBSD L10N Common Entities//EN"
-        "http://www.FreeBSD.org/XML/www/share/sgml/l10n.ent">
+        "http://www.FreeBSD.org/XML/www/share/xml/l10n.ent">
 %l10n-common.ent;
 
 <!ENTITY % release.ent
  PUBLIC "-//FreeBSD//ENTITIES FreeBSD Release Entities//EN"
-        "http://www.FreeBSD.org/XML/www/share/sgml/release.ent">
+        "http://www.FreeBSD.org/XML/www/share/xml/release.ent">
 %release.ent;
 
 <!ENTITY % common.ent
diff --git a/share/sgml/navibar.ent b/share/xml/navibar.ent
index 5774b8afc9..5774b8afc9 100644
--- a/share/sgml/navibar.ent
+++ b/share/xml/navibar.ent
diff --git a/share/sgml/navibar.l10n.ent b/share/xml/navibar.l10n.ent
index 4471c66aa9..4471c66aa9 100644
--- a/share/sgml/navibar.l10n.ent
+++ b/share/xml/navibar.l10n.ent
diff --git a/share/sgml/news.dtd b/share/xml/news.dtd
index 84160525ce..89243e8535 100644
--- a/share/sgml/news.dtd
+++ b/share/xml/news.dtd
@@ -53,7 +53,7 @@
 
 <!ENTITY % cvs
  PUBLIC "-//FreeBSD//DTD FreeBSD CVS Keywords//EN"
-	"http://www.FreeBSD.org/XML/doc/share/sgml/cvs.dtd">
+	"http://www.FreeBSD.org/XML/doc/share/xml/cvs.dtd">
 %cvs;
 
 <!ENTITY % autogen.ent
@@ -63,17 +63,17 @@
 
 <!ENTITY % iso8879.ent
  PUBLIC "-//FreeBSD//ENTITIES ISO 8879:1986 Entity Set//EN//XML"
-        "http://www.FreeBSD.org/XML/www/share/sgml/iso8879.ent">
+        "http://www.FreeBSD.org/XML/www/share/xml/iso8879.ent">
 %iso8879.ent;
 
 <!ENTITY % l10n.ent
  PUBLIC "-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
-        "http://www.FreeBSD.org/XML/www/lang/share/sgml/l10n.ent">
+        "http://www.FreeBSD.org/XML/www/lang/share/xml/l10n.ent">
 %l10n.ent;
 
 <!ENTITY % l10n-common.ent
  PUBLIC "-//FreeBSD//ENTITIES FreeBSD L10N Common Entities//EN"
-        "http://www.FreeBSD.org/XML/www/share/sgml/l10n.ent">
+        "http://www.FreeBSD.org/XML/www/share/xml/l10n.ent">
 %l10n-common.ent;
 
 <!ENTITY % common.ent
diff --git a/share/sgml/news.xml b/share/xml/news.xml
index e47b56c881..3e66794874 100644
--- a/share/sgml/news.xml
+++ b/share/xml/news.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1" ?>
 <!DOCTYPE news PUBLIC "-//FreeBSD//DTD FreeBSD XML Database for News//EN"
-                      "http://www.FreeBSD.org/XML/www/share/sgml/news.dtd">
+                      "http://www.FreeBSD.org/XML/www/share/xml/news.dtd">
 
 <!-- Simple schema for FreeBSD Project news.
 
diff --git a/share/sgml/notices.xml b/share/xml/notices.xml
index 64633c4ec0..64633c4ec0 100644
--- a/share/sgml/notices.xml
+++ b/share/xml/notices.xml
diff --git a/share/sgml/pgp.dsl b/share/xml/pgp.dsl
index 892667e56a..892667e56a 100644
--- a/share/sgml/pgp.dsl
+++ b/share/xml/pgp.dsl
diff --git a/share/sgml/press.dtd b/share/xml/press.dtd
index a5346a3b42..360264fa14 100644
--- a/share/sgml/press.dtd
+++ b/share/xml/press.dtd
@@ -48,7 +48,7 @@
 
 <!ENTITY % cvs
  PUBLIC "-//FreeBSD//DTD FreeBSD CVS Keywords//EN"
-	"http://www.FreeBSD.org/XML/doc/share/sgml/cvs.dtd">
+	"http://www.FreeBSD.org/XML/doc/share/xml/cvs.dtd">
 %cvs;
 
 <!ENTITY % autogen.ent
@@ -58,17 +58,17 @@
 
 <!ENTITY % iso8879.ent
  PUBLIC "-//FreeBSD//ENTITIES ISO 8879:1986 Entity Set//EN//XML"
-        "http://www.FreeBSD.org/XML/www/share/sgml/iso8879.ent">
+        "http://www.FreeBSD.org/XML/www/share/xml/iso8879.ent">
 %iso8879.ent;
 
 <!ENTITY % l10n.ent
  PUBLIC "-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
-        "http://www.FreeBSD.org/XML/www/lang/share/sgml/l10n.ent">
+        "http://www.FreeBSD.org/XML/www/lang/share/xml/l10n.ent">
 %l10n.ent;
 
 <!ENTITY % l10n-common.ent
  PUBLIC "-//FreeBSD//ENTITIES FreeBSD L10N Common Entities//EN"
-        "http://www.FreeBSD.org/XML/www/share/sgml/l10n.ent">
+        "http://www.FreeBSD.org/XML/www/share/xml/l10n.ent">
 %l10n-common.ent;
 
 <!ENTITY % common.ent
diff --git a/share/sgml/press.xml b/share/xml/press.xml
index f7f91a1731..ae0639167b 100644
--- a/share/sgml/press.xml
+++ b/share/xml/press.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE press PUBLIC "-//FreeBSD//DTD FreeBSD XML Database for Press//EN"
-                      "http://www.FreeBSD.org/XML/www/share/sgml/press.dtd">
+                      "http://www.FreeBSD.org/XML/www/share/xml/press.dtd">
 <!--
  COMMITTERS PLEASE NOTE:
     News articles referenced in this file are also to be archived under
diff --git a/share/sgml/release.ent b/share/xml/release.ent
index 6a80b55ba1..6a80b55ba1 100644
--- a/share/sgml/release.ent
+++ b/share/xml/release.ent
diff --git a/share/sgml/release.l10n.ent b/share/xml/release.l10n.ent
index 875bf5cca0..875bf5cca0 100644
--- a/share/sgml/release.l10n.ent
+++ b/share/xml/release.l10n.ent
diff --git a/share/sgml/sitemap.dtd b/share/xml/sitemap.dtd
index 8769f56a15..7b09b827b5 100644
--- a/share/sgml/sitemap.dtd
+++ b/share/xml/sitemap.dtd
@@ -13,7 +13,7 @@
 
 <!ENTITY % cvs
  PUBLIC "-//FreeBSD//DTD FreeBSD CVS Keywords//EN"
-	"http://www.FreeBSD.org/XML/doc/share/sgml/cvs.dtd">
+	"http://www.FreeBSD.org/XML/doc/share/xml/cvs.dtd">
 %cvs;
 
 <!ENTITY % autogen.ent
@@ -23,22 +23,22 @@
 
 <!ENTITY % iso8879.ent
  PUBLIC "-//FreeBSD//ENTITIES ISO 8879:1986 Entity Set//EN//XML"
-        "http://www.FreeBSD.org/XML/www/share/sgml/iso8879.ent">
+        "http://www.FreeBSD.org/XML/www/share/xml/iso8879.ent">
 %iso8879.ent;
 
 <!ENTITY % l10n.ent
  PUBLIC "-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
-        "http://www.FreeBSD.org/XML/www/lang/share/sgml/l10n.ent">
+        "http://www.FreeBSD.org/XML/www/lang/share/xml/l10n.ent">
 %l10n.ent;
 
 <!ENTITY % l10n-common.ent
  PUBLIC "-//FreeBSD//ENTITIES FreeBSD L10N Common Entities//EN"
-        "http://www.FreeBSD.org/XML/www/share/sgml/l10n.ent">
+        "http://www.FreeBSD.org/XML/www/share/xml/l10n.ent">
 %l10n-common.ent;
 
 <!ENTITY % release.ent
  PUBLIC "-//FreeBSD//ENTITIES FreeBSD Release Entities//EN"
-        "http://www.FreeBSD.org/XML/www/share/sgml/release.ent">
+        "http://www.FreeBSD.org/XML/www/share/xml/release.ent">
 %release.ent;
 
 <!ENTITY % common.ent
diff --git a/share/sgml/spellcheck.dsl b/share/xml/spellcheck.dsl
index 5be33407a7..5be33407a7 100644
--- a/share/sgml/spellcheck.dsl
+++ b/share/xml/spellcheck.dsl
diff --git a/share/sgml/statusreport.dtd b/share/xml/statusreport.dtd
index f8e7d61d67..f0e33e4b9e 100644
--- a/share/sgml/statusreport.dtd
+++ b/share/xml/statusreport.dtd
@@ -103,15 +103,15 @@
 
 <!ENTITY % iso8879.ent
  PUBLIC "-//FreeBSD//ENTITIES ISO 8879:1986 Entity Set//EN//XML"
-        "http://www.FreeBSD.org/XML/www/share/sgml/iso8879.ent">
+        "http://www.FreeBSD.org/XML/www/share/xml/iso8879.ent">
 %iso8879.ent;
 
 <!ENTITY % l10n.ent
  PUBLIC "-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
-        "http://www.FreeBSD.org/XML/www/share/sgml/l10n.ent">
+        "http://www.FreeBSD.org/XML/www/share/xml/l10n.ent">
 %l10n.ent;
 
 <!ENTITY % common.ent
  PUBLIC "-//FreeBSD//ENTITIES FreeBSD Common Entities//EN"
-        "http://www.FreeBSD.org/XML/www/share/sgml/common.ent">
+        "http://www.FreeBSD.org/XML/www/share/xml/common.ent">
 %common.ent;
diff --git a/share/sgml/templates.entries.xsl b/share/xml/templates.entries.xsl
index 008b7c7a29..7599c2c45a 100644
--- a/share/sgml/templates.entries.xsl
+++ b/share/xml/templates.entries.xsl
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1" ?>
 <!DOCTYPE xsl:stylesheet PUBLIC "-//FreeBSD//DTD FreeBSD XSLT 1.0 DTD//EN"
-				"http://www.FreeBSD.org/XML/www/share/sgml/xslt10-freebsd.dtd" [
+				"http://www.FreeBSD.org/XML/www/share/xml/xslt10-freebsd.dtd" [
 <!ENTITY title "Commercial Vendors">
 ]>
 
@@ -10,8 +10,8 @@
   xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
   xmlns="http://www.w3.org/1999/xhtml">
 
-  <xsl:import href="http://www.FreeBSD.org/XML/www/share/sgml/libcommon.xsl"/>
-  <xsl:import href="http://www.FreeBSD.org/XML/www/share/sgml/xhtml.xsl"/>
+  <xsl:import href="http://www.FreeBSD.org/XML/www/share/xml/libcommon.xsl"/>
+  <xsl:import href="http://www.FreeBSD.org/XML/www/share/xml/xhtml.xsl"/>
 
   <xsl:param name="basename" select="'none'" />
   <xsl:param name="sort" select="'none'" />
diff --git a/share/sgml/templates.events.xsl b/share/xml/templates.events.xsl
index 60706f9e40..c958e8d29c 100644
--- a/share/sgml/templates.events.xsl
+++ b/share/xml/templates.events.xsl
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1" ?>
 <!DOCTYPE xsl:stylesheet PUBLIC "-//FreeBSD//DTD FreeBSD XSLT 1.0 DTD Fragment//EN"
-				"http://www.FreeBSD.org/XML/www/share/sgml/xslt10-freebsd.dtd" [
+				"http://www.FreeBSD.org/XML/www/share/xml/xslt10-freebsd.dtd" [
 <!ENTITY title "FreeBSD Events">
 <!ENTITY rsslink "&base;/events/rss.xml">
 <!ENTITY rsstitle "Upcoming FreeBSD Events">
@@ -39,8 +39,8 @@
   xmlns="http://www.w3.org/1999/xhtml"
   extension-element-prefixes="date">
 
-  <xsl:import href="http://www.FreeBSD.org/XML/www/lang/share/sgml/libcommon.xsl"/>
-  <xsl:import href="http://www.FreeBSD.org/XML/www/share/sgml/xhtml.xsl"/>
+  <xsl:import href="http://www.FreeBSD.org/XML/www/lang/share/xml/libcommon.xsl"/>
+  <xsl:import href="http://www.FreeBSD.org/XML/www/share/xml/xhtml.xsl"/>
 
   <xsl:param name="startyear">2007</xsl:param>
   <xsl:param name="pastyears">2003 2004 2005 2006</xsl:param>
diff --git a/share/sgml/templates.events2ics.xsl b/share/xml/templates.events2ics.xsl
index 511b05bded..b429212788 100644
--- a/share/sgml/templates.events2ics.xsl
+++ b/share/xml/templates.events2ics.xsl
@@ -1,5 +1,5 @@
 <!DOCTYPE xsl:stylesheet PUBLIC "-//FreeBSD//DTD FreeBSD XSLT 1.0 DTD Fragment//EN"
-				"http://www.FreeBSD.org/XML/www/share/sgml/xslt10-freebsd.dtd" [
+				"http://www.FreeBSD.org/XML/www/share/xml/xslt10-freebsd.dtd" [
 ]>
 
 <!-- $FreeBSD$ -->
@@ -35,7 +35,7 @@
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
   xmlns:cvs="http://www.FreeBSD.org/XML/CVS"
   exclude-result-prefixes="cvs">
-  <xsl:import href="http://www.FreeBSD.org/XML/www/lang/share/sgml/libcommon.xsl"/>
+  <xsl:import href="http://www.FreeBSD.org/XML/www/lang/share/xml/libcommon.xsl"/>
 
   <xsl:variable name="freebsd-web-base" select="'http://www.FreeBSD.org'"/>
 
diff --git a/share/sgml/templates.news-rdf.xsl b/share/xml/templates.news-rdf.xsl
index a948891778..dc43f84f4d 100644
--- a/share/sgml/templates.news-rdf.xsl
+++ b/share/xml/templates.news-rdf.xsl
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="iso-8859-1" ?>
 <!DOCTYPE xsl:stylesheet PUBLIC "-//FreeBSD//DTD FreeBSD XSLT 1.0 DTD//EN"
-				"http://www.FreeBSD.org/XML/www/share/sgml/xslt10-freebsd.dtd">
+				"http://www.FreeBSD.org/XML/www/share/xml/xslt10-freebsd.dtd">
 
 <!-- $FreeBSD$ -->
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
   xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
 
-  <xsl:import href="http://www.FreeBSD.org/XML/www/lang/share/sgml/libcommon.xsl"/>
+  <xsl:import href="http://www.FreeBSD.org/XML/www/lang/share/xml/libcommon.xsl"/>
 
   <xsl:output method="xml" indent="yes" encoding="&xml.encoding;"/>
 
diff --git a/share/sgml/templates.news-rss.xsl b/share/xml/templates.news-rss.xsl
index aaef216c2f..ab733ced7c 100644
--- a/share/sgml/templates.news-rss.xsl
+++ b/share/xml/templates.news-rss.xsl
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1" ?>
 <!DOCTYPE xsl:stylesheet PUBLIC "-//FreeBSD//DTD FreeBSD XSLT 1.0 DTD//EN"
-				"http://www.FreeBSD.org/XML/www/share/sgml/xslt10-freebsd.dtd" [
+				"http://www.FreeBSD.org/XML/www/share/xml/xslt10-freebsd.dtd" [
 <!ENTITY title "FreeBSD News Flash">
 <!ENTITY link "http://www.FreeBSD.org/news/">
 <!ENTITY email "freebsd-www">
@@ -13,7 +13,7 @@
   xmlns:cvs="http://www.FreeBSD.org/XML/CVS"
   exclude-result-prefixes="cvs">
 
-  <xsl:import href="http://www.FreeBSD.org/XML/www/lang/share/sgml/libcommon.xsl"/>
+  <xsl:import href="http://www.FreeBSD.org/XML/www/lang/share/xml/libcommon.xsl"/>
 
   <xsl:output method="xml" indent="yes" encoding="&xml.encoding;"/>
 
diff --git a/share/sgml/templates.newsflash.xsl b/share/xml/templates.newsflash.xsl
index 1a2f0e4ac6..9d41eb909e 100644
--- a/share/sgml/templates.newsflash.xsl
+++ b/share/xml/templates.newsflash.xsl
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1" ?>
 <!DOCTYPE xsl:stylesheet PUBLIC "-//FreeBSD//DTD FreeBSD XSLT 1.0 DTD//EN"
-				"http://www.FreeBSD.org/XML/www/share/sgml/xslt10-freebsd.dtd" [
+				"http://www.FreeBSD.org/XML/www/share/xml/xslt10-freebsd.dtd" [
 <!ENTITY title "FreeBSD News Flash">
 <!ENTITY rsslink "rss.xml">
 <!ENTITY rsstitle "&title;">
@@ -12,8 +12,8 @@
   xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
   xmlns="http://www.w3.org/1999/xhtml">
 
-  <xsl:import href="http://www.FreeBSD.org/XML/www/lang/share/sgml/libcommon.xsl"/>
-  <xsl:import href="http://www.FreeBSD.org/XML/www/share/sgml/xhtml.xsl"/>
+  <xsl:import href="http://www.FreeBSD.org/XML/www/lang/share/xml/libcommon.xsl"/>
+  <xsl:import href="http://www.FreeBSD.org/XML/www/share/xml/xhtml.xsl"/>
 
   <xsl:param name="news.project.xml-master" select="'none'" />
   <xsl:param name="news.project.xml" select="'none'" />
diff --git a/share/sgml/templates.oldnewsflash.xsl b/share/xml/templates.oldnewsflash.xsl
index 1501d97962..9e47cd2d33 100644
--- a/share/sgml/templates.oldnewsflash.xsl
+++ b/share/xml/templates.oldnewsflash.xsl
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1" ?>
 <!DOCTYPE xsl:stylesheet PUBLIC "-//FreeBSD//DTD FreeBSD XSLT 1.0 DTD//EN"
-				"http://www.FreeBSD.org/XML/www/share/sgml/xslt10-freebsd.dtd" [
+				"http://www.FreeBSD.org/XML/www/share/xml/xslt10-freebsd.dtd" [
 <!ENTITY title "FreeBSD News Flash">
 ]>
 
@@ -10,8 +10,8 @@
   xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
   xmlns="http://www.w3.org/1999/xhtml">
 
-  <xsl:import href="http://www.FreeBSD.org/XML/www/lang/share/sgml/libcommon.xsl"/>
-  <xsl:import href="http://www.FreeBSD.org/XML/www/share/sgml/xhtml.xsl"/>
+  <xsl:import href="http://www.FreeBSD.org/XML/www/lang/share/xml/libcommon.xsl"/>
+  <xsl:import href="http://www.FreeBSD.org/XML/www/share/xml/xhtml.xsl"/>
 
   <!-- Do not add last modified date for old news/press -->
   <xsl:variable name="date"/>
diff --git a/share/sgml/templates.oldpress.xsl b/share/xml/templates.oldpress.xsl
index 1be94e886f..52e47d95d3 100644
--- a/share/sgml/templates.oldpress.xsl
+++ b/share/xml/templates.oldpress.xsl
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1" ?>
 <!DOCTYPE xsl:stylesheet PUBLIC "-//FreeBSD//DTD FreeBSD XSLT 1.0 DTD//EN"
-				"http://www.FreeBSD.org/XML/www/share/sgml/xslt10-freebsd.dtd" [
+				"http://www.FreeBSD.org/XML/www/share/xml/xslt10-freebsd.dtd" [
 <!ENTITY title "FreeBSD in the Press">
 ]>
 
@@ -10,8 +10,8 @@
   xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
   xmlns="http://www.w3.org/1999/xhtml">
 
-  <xsl:import href="http://www.FreeBSD.org/XML/www/lang/share/sgml/libcommon.xsl"/>
-  <xsl:import href="http://www.FreeBSD.org/XML/www/share/sgml/xhtml.xsl"/>
+  <xsl:import href="http://www.FreeBSD.org/XML/www/lang/share/xml/libcommon.xsl"/>
+  <xsl:import href="http://www.FreeBSD.org/XML/www/share/xml/xhtml.xsl"/>
 
   <!-- Do not add last modified date for old news/press -->
   <xsl:variable name="date"/>
diff --git a/share/sgml/templates.pastevents.xsl b/share/xml/templates.pastevents.xsl
index 843f3ee623..f8cc194abe 100644
--- a/share/sgml/templates.pastevents.xsl
+++ b/share/xml/templates.pastevents.xsl
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1" ?>
 <!DOCTYPE xsl:stylesheet PUBLIC "-//FreeBSD//DTD FreeBSD XSLT 1.0 DTD Fragment//EN"
-				"http://www.FreeBSD.org/XML/www/share/sgml/xslt10-freebsd.dtd" [
+				"http://www.FreeBSD.org/XML/www/share/xml/xslt10-freebsd.dtd" [
 <!ENTITY title "FreeBSD Past Events">
 <!ENTITY rsslink "&base;/events/rss.xml">
 <!ENTITY rsstitle "Upcoming FreeBSD Events">
@@ -39,8 +39,8 @@
   xmlns="http://www.w3.org/1999/xhtml"
   extension-element-prefixes="date">
 
-  <xsl:import href="http://www.FreeBSD.org/XML/www/lang/share/sgml/libcommon.xsl"/>
-  <xsl:import href="http://www.FreeBSD.org/XML/www/share/sgml/xhtml.xsl"/>
+  <xsl:import href="http://www.FreeBSD.org/XML/www/lang/share/xml/libcommon.xsl"/>
+  <xsl:import href="http://www.FreeBSD.org/XML/www/share/xml/xhtml.xsl"/>
 
   <!-- Do not add last modified date for old news/press -->
   <xsl:variable name="date"/>
diff --git a/share/sgml/templates.press-rss.xsl b/share/xml/templates.press-rss.xsl
index 1a56ac445a..789efc22f4 100644
--- a/share/sgml/templates.press-rss.xsl
+++ b/share/xml/templates.press-rss.xsl
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1" ?>
 <!DOCTYPE xsl:stylesheet PUBLIC "-//FreeBSD//DTD FreeBSD XSLT 1.0 DTD//EN"
-				"http://www.FreeBSD.org/XML/www/share/sgml/xslt10-freebsd.dtd" [
+				"http://www.FreeBSD.org/XML/www/share/xml/xslt10-freebsd.dtd" [
 <!ENTITY title "FreeBSD in the Press">
 <!ENTITY link "http://www.FreeBSD.org/news/press.html">
 <!ENTITY email "freebsd-www">
@@ -39,7 +39,7 @@
   xmlns:cvs="http://www.FreeBSD.org/XML/CVS"
   exclude-result-prefixes="cvs">
 
-  <xsl:import href="http://www.FreeBSD.org/XML/www/lang/share/sgml/libcommon.xsl"/>
+  <xsl:import href="http://www.FreeBSD.org/XML/www/lang/share/xml/libcommon.xsl"/>
 
   <xsl:output method="xml" indent="yes" encoding="&xml.encoding;"/>
 
diff --git a/share/sgml/templates.press.xsl b/share/xml/templates.press.xsl
index d498bc0ec1..463a99ccdc 100644
--- a/share/sgml/templates.press.xsl
+++ b/share/xml/templates.press.xsl
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1" ?>
 <!DOCTYPE xsl:stylesheet PUBLIC "-//FreeBSD//DTD FreeBSD XSLT 1.0 DTD//EN"
-				"http://www.FreeBSD.org/XML/www/share/sgml/xslt10-freebsd.dtd" [
+				"http://www.FreeBSD.org/XML/www/share/xml/xslt10-freebsd.dtd" [
 <!ENTITY title "FreeBSD in the Press">
 <!ENTITY rsslink "press-rss.xml">
 <!ENTITY rsstitle "&title;">
@@ -12,8 +12,8 @@
   xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
   xmlns="http://www.w3.org/1999/xhtml">
 
-  <xsl:import href="http://www.FreeBSD.org/XML/www/lang/share/sgml/libcommon.xsl"/>
-  <xsl:import href="http://www.FreeBSD.org/XML/www/share/sgml/xhtml.xsl"/>
+  <xsl:import href="http://www.FreeBSD.org/XML/www/lang/share/xml/libcommon.xsl"/>
+  <xsl:import href="http://www.FreeBSD.org/XML/www/share/xml/xhtml.xsl"/>
 
   <xsl:param name="news.press.xml-master" select="'none'" />
   <xsl:param name="news.press.xml" select="'none'" />
diff --git a/share/sgml/templates.usergroups.xsl b/share/xml/templates.usergroups.xsl
index 25fd944c39..cf86ccab2a 100644
--- a/share/sgml/templates.usergroups.xsl
+++ b/share/xml/templates.usergroups.xsl
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE xsl:stylesheet PUBLIC "-//FreeBSD//DTD FreeBSD XSLT 1.0 DTD Fragment//EN"
-                                "http://www.FreeBSD.org/XML/www/share/sgml/xslt10-freebsd.dtd" [
+                                "http://www.FreeBSD.org/XML/www/share/xml/xslt10-freebsd.dtd" [
 <!ENTITY title "User Groups">
 ]>
 
@@ -10,8 +10,8 @@
   xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
   xmlns="http://www.w3.org/1999/xhtml">
 
-  <xsl:import href="http://www.FreeBSD.org/XML/www/lang/share/sgml/libcommon.xsl"/>
-  <xsl:import href="http://www.FreeBSD.org/XML/www/share/sgml/xhtml.xsl"/>
+  <xsl:import href="http://www.FreeBSD.org/XML/www/lang/share/xml/libcommon.xsl"/>
+  <xsl:import href="http://www.FreeBSD.org/XML/www/share/xml/xhtml.xsl"/>
 
   <xsl:key name="usergroup-by-country" match="entry"
     use="../@code" />
diff --git a/share/sgml/trademarks.ent b/share/xml/trademarks.ent
index dc06cb1aa7..dc06cb1aa7 100644
--- a/share/sgml/trademarks.ent
+++ b/share/xml/trademarks.ent
diff --git a/share/sgml/transtable-common.xsl b/share/xml/transtable-common.xsl
index ae92cca831..ae92cca831 100644
--- a/share/sgml/transtable-common.xsl
+++ b/share/xml/transtable-common.xsl
diff --git a/share/sgml/transtable-local.xsl b/share/xml/transtable-local.xsl
index 70e7a29c45..f7dc7683a4 100644
--- a/share/sgml/transtable-local.xsl
+++ b/share/xml/transtable-local.xsl
@@ -3,7 +3,7 @@
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
 
-  <!-- must point to master copy, doc/share/sgml/transtable-master.xsl -->
+  <!-- must point to master copy, doc/share/xml/transtable-master.xsl -->
   <xsl:import href="./transtable-master.xsl" />
 
   <xsl:output type="xml"
diff --git a/share/sgml/transtable-master.xsl b/share/xml/transtable-master.xsl
index a5a57c380b..a5a57c380b 100644
--- a/share/sgml/transtable-master.xsl
+++ b/share/xml/transtable-master.xsl
diff --git a/share/sgml/transtable.xml b/share/xml/transtable.xml
index 54320c13aa..54320c13aa 100644
--- a/share/sgml/transtable.xml
+++ b/share/xml/transtable.xml
diff --git a/share/sgml/urls.ent b/share/xml/urls.ent
index 0e309e2890..0e309e2890 100644
--- a/share/sgml/urls.ent
+++ b/share/xml/urls.ent
diff --git a/share/sgml/usergroups.dtd b/share/xml/usergroups.dtd
index 0dec50d6bb..de4db08cd2 100644
--- a/share/sgml/usergroups.dtd
+++ b/share/xml/usergroups.dtd
@@ -24,15 +24,15 @@
 
 <!ENTITY % iso8879.ent
  PUBLIC "-//FreeBSD//ENTITIES ISO 8879:1986 Entity Set//EN//XML"
-        "http://www.FreeBSD.org/XML/www/share/sgml/iso8879.ent">
+        "http://www.FreeBSD.org/XML/www/share/xml/iso8879.ent">
 %iso8879.ent;
 
 <!ENTITY % l10n.ent
  PUBLIC "-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
-        "http://www.FreeBSD.org/XML/www/share/sgml/l10n.ent">
+        "http://www.FreeBSD.org/XML/www/share/xml/l10n.ent">
 %l10n.ent;
 
 <!ENTITY % common.ent
  PUBLIC "-//FreeBSD//ENTITIES FreeBSD Common Entities//EN"
-        "http://www.FreeBSD.org/XML/www/share/sgml/common.ent">
+        "http://www.FreeBSD.org/XML/www/share/xml/common.ent">
 %common.ent;
diff --git a/share/sgml/usergroups.xml b/share/xml/usergroups.xml
index 40c82004b7..4ae5f13f26 100644
--- a/share/sgml/usergroups.xml
+++ b/share/xml/usergroups.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE usergroups PUBLIC "-//FreeBSD//DTD FreeBSD XML Database for UserGroups//EN"
-                            "http://www.FreeBSD.org/XML/www/share/sgml/usergoups.dtd">
+                            "http://www.FreeBSD.org/XML/www/share/xml/usergoups.dtd">
 
 <usergroups>
     <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
diff --git a/share/sgml/xhtml.xsl b/share/xml/xhtml.xsl
index 130495b43c..268110cb5d 100644
--- a/share/sgml/xhtml.xsl
+++ b/share/xml/xhtml.xsl
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!DOCTYPE xsl:stylesheet PUBLIC "-//FreeBSD//DTD FreeBSD XSLT 1.0 DTD//EN"
-"http://www.FreeBSD.org/XML/www/share/sgml/xslt10-freebsd.dtd">
+"http://www.FreeBSD.org/XML/www/share/xml/xslt10-freebsd.dtd">
 <!-- $FreeBSD$ -->
 
 <xsl:stylesheet version="1.0"
diff --git a/share/sgml/xhtml10-freebsd.dtd b/share/xml/xhtml10-freebsd.dtd
index 2d335a9c2b..4318ac5d52 100644
--- a/share/sgml/xhtml10-freebsd.dtd
+++ b/share/xml/xhtml10-freebsd.dtd
@@ -8,39 +8,39 @@
 %autogen.ent;
 
 <!ENTITY % l10n.ent PUBLIC "-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
-"http://www.FreeBSD.org/XML/doc/share/sgml/l10n.ent">
+"http://www.FreeBSD.org/XML/doc/share/xml/l10n.ent">
 %l10n.ent;
 
 <!ENTITY % common.ent PUBLIC "-//FreeBSD//ENTITIES FreeBSD Common Entities//EN"
-"http://www.FreeBSD.org/XML/doc/share/sgml/common.ent">
+"http://www.FreeBSD.org/XML/doc/share/xml/common.ent">
 %common.ent;
 
 <!ENTITY % release.ent PUBLIC "-//FreeBSD//ENTITIES FreeBSD Release Entities//EN"
-"http://www.FreeBSD.org/XML/doc/share/sgml/release.ent">
+"http://www.FreeBSD.org/XML/doc/share/xml/release.ent">
 %release.ent;
 
 <!ENTITY % release.l10n.ent PUBLIC "-//FreeBSD//ENTITIES FreeBSD Release L10N Entities//EN"
-"http://www.FreeBSD.org/XML/doc/lang/share/sgml/release.l10n.ent">
+"http://www.FreeBSD.org/XML/doc/lang/share/xml/release.l10n.ent">
 %release.l10n.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">
+"http://www.FreeBSD.org/XML/doc/lang/share/xml/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">
+"http://www.FreeBSD.org/XML/doc/share/xml/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">
+"http://www.FreeBSD.org/XML/doc/lang/share/xml/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">
+"http://www.FreeBSD.org/XML/doc/share/xml/header.ent">
 %header.ent;
 
 <!ENTITY % developers PUBLIC "-//FreeBSD//ENTITIES FreeBSD Developers Entities//EN"
-"http://www.FreeBSD.org/XML/doc/share/sgml/developers.ent">
+"http://www.FreeBSD.org/XML/doc/share/xml/developers.ent">
 %developers;
 
 <!-- Allow xmlns on all elements -->
@@ -53,7 +53,7 @@
   >
 
 <!ENTITY % cvs PUBLIC "-//FreeBSD//DTD FreeBSD CVS Keywords//EN"
-"http://www.FreeBSD.org/XML/doc/share/sgml/cvs.dtd">
+"http://www.FreeBSD.org/XML/doc/share/xml/cvs.dtd">
 %cvs;
 
 <!ENTITY % head.misc "(cvs:keyword|script|style|meta|link|object|isindex)*">
diff --git a/share/sgml/xslt10-freebsd.dtd b/share/xml/xslt10-freebsd.dtd
index 233c8a41fa..635738aa23 100644
--- a/share/sgml/xslt10-freebsd.dtd
+++ b/share/xml/xslt10-freebsd.dtd
@@ -7,12 +7,12 @@
 <!--
 <!ENTITY % man-refs.ent
  PUBLIC "-//FreeBSD//ENTITIES FreeBSD Manual Page Entities//EN"
-        "http://www.FreeBSD.org/XML/doc/share/sgml/man-refs.ent">
+        "http://www.FreeBSD.org/XML/doc/share/xml/man-refs.ent">
 %man-refs.ent;
 
 <!ENTITY % developers.ent
  PUBLIC "-//FreeBSD//ENTITIES FreeBSD Developers Entities//EN"
-        "http://www.FreeBSD.org/XML/doc/share/sgml/developers.ent">
+        "http://www.FreeBSD.org/XML/doc/share/xml/developers.ent">
 %developers.ent;
 -->
 
@@ -23,12 +23,12 @@
 
 <!ENTITY % l10n.ent
  PUBLIC "-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
-        "http://www.FreeBSD.org/XML/www/lang/share/sgml/l10n.ent">
+        "http://www.FreeBSD.org/XML/www/lang/share/xml/l10n.ent">
 %l10n.ent;
 
 <!ENTITY % l10n-common.ent
  PUBLIC "-//FreeBSD//ENTITIES FreeBSD L10N Common Entities//EN"
-        "http://www.FreeBSD.org/XML/www/share/sgml/l10n.ent">
+        "http://www.FreeBSD.org/XML/www/share/xml/l10n.ent">
 %l10n-common.ent;
 
 <!ENTITY % common.ent
@@ -48,17 +48,17 @@
 
 <!ENTITY % navibar.l10n.ent
  PUBLIC "-//FreeBSD//ENTITIES HTML FreeBSD Navigation Bar L10N Entities//EN"
-        "http://www.FreeBSD.org/XML/www/lang/share/sgml/navibar.l10n.ent">
+        "http://www.FreeBSD.org/XML/www/lang/share/xml/navibar.l10n.ent">
 %navibar.l10n.ent;
 
 <!ENTITY % navibar.ent
  PUBLIC "-//FreeBSD//ENTITIES HTML FreeBSD Navigation Bar Entities//EN"
-        "http://www.FreeBSD.org/XML/www/share/sgml/navibar.ent">
+        "http://www.FreeBSD.org/XML/www/share/xml/navibar.ent">
 %navibar.ent;
 
 <!ENTITY % header.l10n.ent
  PUBLIC "-//FreeBSD//ENTITIES HTML FreeBSD Header L10N Entities//EN"
-        "http://www.FreeBSD.org/XML/www/lang/share/sgml/header.l10n.ent">
+        "http://www.FreeBSD.org/XML/www/lang/share/xml/header.l10n.ent">
 %header.l10n.ent;
 
 <!ENTITY % header.ent
@@ -68,10 +68,10 @@
 
 <!ENTITY % xslt10-orig.dtd
  PUBLIC "-//FreeBSD//DTD FreeBSD XSLT 1.0 DTD Fragment//EN"
-        "http://www.FreeBSD.org/XML/www/share/sgml/xslt10.dtd">
+        "http://www.FreeBSD.org/XML/www/share/xml/xslt10.dtd">
 %xslt10-orig.dtd;
 
 <!ENTITY % iso8879.ent
  PUBLIC "-//FreeBSD//ENTITIES ISO 8879:1986 Entity Set//EN//XML"
-        "http://www.FreeBSD.org/XML/www/share/sgml/iso8879.ent">
+        "http://www.FreeBSD.org/XML/www/share/xml/iso8879.ent">
 %iso8879.ent;
diff --git a/share/sgml/xslt10.dtd b/share/xml/xslt10.dtd
index 054536972f..054536972f 100644
--- a/share/sgml/xslt10.dtd
+++ b/share/xml/xslt10.dtd