diff --git a/da_DK.ISO8859-1/share/xml/entities.ent b/da_DK.ISO8859-1/share/xml/entities.ent
index 2b612813a1..c7853679a4 100644
--- a/da_DK.ISO8859-1/share/xml/entities.ent
+++ b/da_DK.ISO8859-1/share/xml/entities.ent
@@ -1,21 +1,30 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!-- $FreeBSD$ -->
 
-<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN">
+<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN"
+	"nonexistent">
 %authors;
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
+<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN"
+	"nonexistent">
 %man;
-<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN">
+<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN"
+	"nonexistent">
 %freebsd;
-<!ENTITY % translators PUBLIC "-//FreeBSD//ENTITIES DocBook Translator Entities//DK">
+<!ENTITY % translators PUBLIC "-//FreeBSD//ENTITIES DocBook Translator Entities//DK"
+	"translators.ent">
 %translators;
-<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN">
+<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
+	"l10n.ent">
 %l10n;
-<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//DK">
+<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//DK"
+	"mailing-lists.ent">
 %mailing-lists;
-<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//DK">
+<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//DK"
+	"newsgroups.ent">
 %newsgroups;
-<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//DK">
+<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//DK"
+	"teams.ent">
 %teams;
-<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">
+<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN"
+	"nonexistent">
 %trademarks;
diff --git a/da_DK.ISO8859-1/share/xml/mailing-lists.ent b/da_DK.ISO8859-1/share/xml/mailing-lists.ent
index 080b91e29f..e6647db98c 100644
--- a/da_DK.ISO8859-1/share/xml/mailing-lists.ent
+++ b/da_DK.ISO8859-1/share/xml/mailing-lists.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      Navne p� FreeBSD mailing lister og relateret software.
 
diff --git a/da_DK.ISO8859-1/share/xml/newsgroups.ent b/da_DK.ISO8859-1/share/xml/newsgroups.ent
index fe16bf2b42..85d53e443d 100644
--- a/da_DK.ISO8859-1/share/xml/newsgroups.ent
+++ b/da_DK.ISO8859-1/share/xml/newsgroups.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      Navne p� FreeBSD nyhedsgrupper
 
diff --git a/da_DK.ISO8859-1/share/xml/teams.ent b/da_DK.ISO8859-1/share/xml/teams.ent
index 25a971a3b7..32179d0bbe 100644
--- a/da_DK.ISO8859-1/share/xml/teams.ent
+++ b/da_DK.ISO8859-1/share/xml/teams.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      Navne og email adresser p� de teams af folk der arbejder
      p� specifikke opgaver.  Normalt er de bare mail aliaser der
diff --git a/da_DK.ISO8859-1/share/xml/translators.ent b/da_DK.ISO8859-1/share/xml/translators.ent
index 58c5b91f99..df69892e8f 100644
--- a/da_DK.ISO8859-1/share/xml/translators.ent
+++ b/da_DK.ISO8859-1/share/xml/translators.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Dannish Documentation Project
diff --git a/de_DE.ISO8859-1/share/xml/entities.ent b/de_DE.ISO8859-1/share/xml/entities.ent
index 0048526ffd..5061a702fe 100644
--- a/de_DE.ISO8859-1/share/xml/entities.ent
+++ b/de_DE.ISO8859-1/share/xml/entities.ent
@@ -4,29 +4,39 @@
 	basiert auf: 1.1
 -->
 
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
+<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN"
+	"nonexistent">
 %man;
-<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN">
+<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN"
+	"nonexistent">
 %freebsd;
-<!ENTITY % translators PUBLIC "-//FreeBSD//ENTITIES DocBook Translator Entities//DE">
+<!ENTITY % translators PUBLIC "-//FreeBSD//ENTITIES DocBook Translator Entities//DE"
+	"translators.ent">
 %translators;
-<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN">
+<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN"
+	"nonexistent">
 %authors;
-<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//EN">
+<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//EN"
+	"nonexistent">
 %teams;
-<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//DE">
+<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//DE"
+	"mailing-lists.ent">
 %mailing-lists;
-<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//EN">
+<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//EN"
+	"nonexistent">
 %newsgroups;
-<!ENTITY % de-trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//DE">
+<!ENTITY % de-trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//DE"
+	"trademarks.ent">
 %de-trademarks;
-<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">
+<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN"
+	"nonexistent">
 %trademarks;
-<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN">
+<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
+	"l10n.ent">
 %l10n;
-<!ENTITY % l10n-common PUBLIC "-//FreeBSD//ENTITIES DocBook Language Neutral Entities//EN">
-%l10n-common;
-<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN">
+<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN"
+	"nonexistent">
 %urls;
-<!ENTITY % glossary PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//DE">
+<!ENTITY % glossary PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//DE"
+	"glossary.ent">
 %glossary;
diff --git a/de_DE.ISO8859-1/share/xml/l10n.ent b/de_DE.ISO8859-1/share/xml/l10n.ent
index 59defb096c..7e6e2c1de0 100644
--- a/de_DE.ISO8859-1/share/xml/l10n.ent
+++ b/de_DE.ISO8859-1/share/xml/l10n.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!-- -*- sgml -*-
      DocBook Language Specific Entities for Localization (en).
 
diff --git a/de_DE.ISO8859-1/share/xml/mailing-lists.ent b/de_DE.ISO8859-1/share/xml/mailing-lists.ent
index ff0b7bd91a..d4011db972 100644
--- a/de_DE.ISO8859-1/share/xml/mailing-lists.ent
+++ b/de_DE.ISO8859-1/share/xml/mailing-lists.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      Namen der FreeBSD Mailinglisten und verwandter Software
 
diff --git a/de_DE.ISO8859-1/share/xml/newsgroups.ent b/de_DE.ISO8859-1/share/xml/newsgroups.ent
index 7b62f42be1..8c647970a5 100644
--- a/de_DE.ISO8859-1/share/xml/newsgroups.ent
+++ b/de_DE.ISO8859-1/share/xml/newsgroups.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      Namen der FreeBSD-Newsgroups
 
diff --git a/de_DE.ISO8859-1/share/xml/teams.ent b/de_DE.ISO8859-1/share/xml/teams.ent
index 1f67441164..f5ad53f6b3 100644
--- a/de_DE.ISO8859-1/share/xml/teams.ent
+++ b/de_DE.ISO8859-1/share/xml/teams.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      Names and email address of teams of people working on specified
      tasks. Usally they're just mail aliases set up at hub.FreeBSD.org
diff --git a/de_DE.ISO8859-1/share/xml/trademarks.ent b/de_DE.ISO8859-1/share/xml/trademarks.ent
index 1c6879d352..218b70a202 100644
--- a/de_DE.ISO8859-1/share/xml/trademarks.ent
+++ b/de_DE.ISO8859-1/share/xml/trademarks.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      Trademark Legend, as required by The Open Group, Sun, etc..
 
diff --git a/de_DE.ISO8859-1/share/xml/translators.ent b/de_DE.ISO8859-1/share/xml/translators.ent
index 41efe4c6cc..747d5116e1 100644
--- a/de_DE.ISO8859-1/share/xml/translators.ent
+++ b/de_DE.ISO8859-1/share/xml/translators.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
       The FreeBSD Documentation Project
       The FreeBSD German Documentation Project
diff --git a/el_GR.ISO8859-7/share/xml/entities.ent b/el_GR.ISO8859-7/share/xml/entities.ent
index ad55947dbf..f97fae18b6 100644
--- a/el_GR.ISO8859-7/share/xml/entities.ent
+++ b/el_GR.ISO8859-7/share/xml/entities.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-7"?>
 <!--
 
   ������� ��� entities ��� ����� �������� �� ��� �� ������ ��� ���������
@@ -12,50 +13,66 @@
 
 -->
 
-<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN">
+<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
+	"l10n.ent">
 %l10n;
-<!ENTITY % l10n-common PUBLIC "-//FreeBSD//ENTITIES DocBook Language Neutral Entities//EN">
-%l10n-common;
-<!ENTITY % translators PUBLIC "-//FreeBSD//ENTITIES DocBook Translator Entities//EL">
+<!ENTITY % translators PUBLIC "-//FreeBSD//ENTITIES DocBook Translator Entities//EL"
+	"translators.ent">
 %translators;
-<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//EL">
+<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//EL"
+	"mailing-lists.ent">
 %mailing-lists;
-<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//EL">
+<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//EL"
+	"teams.ent">
 %teams;
-<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//EL">
+<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//EL"
+	"newsgroups.ent">
 %newsgroups;
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
+<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN"
+	"nonexistent">
 %man;
-<!ENTITY % glossary PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//EL">
+<!ENTITY % glossary PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//EL"
+	"glossary.ent">
 %glossary;
 
 <!-- � ����� ��� %freebsd.el; ��� %freebsd; ����� ���������.
      ������������� ����� �� entities ��� ��������� �����.  ����� ���������
      ��� ����� ����������� ��� ��������, �� �������� �������� ��� ���
      ������� ������ -->
-<!ENTITY % freebsd.el PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EL">
+<!ENTITY % freebsd.el PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EL"
+	"freebsd.ent">
 %freebsd.el;
-<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN">
+<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EL"
+	"freebsd.ent">
 %freebsd;
-
-<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN">
+<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN"
+        "nonexistent">
+%freebsd;
+<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN"
+	"nonexistent">
 %authors;
-<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//EL">
+<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//EL"
+	"teams.ent">
 %teams;
-<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//EL">
+<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//EL"
+	"mailing-lists.ent">
 %mailing-lists;
-<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//EL">
+<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//EL"
+	"newsgroups.ent">
 %newsgroups;
-<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EL">
+<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EL"
+	"trademarks.ent">
 %trademarks;
 
 <!-- � ����� ��� %urls.el; ��� %urls; ����� ���������.
      ������������� ����� �� entities ��� ��������� �����.  ����� ���������
      ��� ����� ����������� ��� ��������, �� �������� �������� ��� ���
      ������� ������ -->
-<!ENTITY % urls.el PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EL">
+<!ENTITY % urls.el PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EL"
+	"urls.ent">
 %urls.el;
-<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN">
+<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN"
+	"nonexistent">
 %urls;
 
 <!--
diff --git a/el_GR.ISO8859-7/share/xml/freebsd.ent b/el_GR.ISO8859-7/share/xml/freebsd.ent
index 783ac46705..4f62e17b80 100644
--- a/el_GR.ISO8859-7/share/xml/freebsd.ent
+++ b/el_GR.ISO8859-7/share/xml/freebsd.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-7"?>
 <!--
 
   ������� DocBook Entities ��� �� FreeBSD Project.
diff --git a/el_GR.ISO8859-7/share/xml/l10n.ent b/el_GR.ISO8859-7/share/xml/l10n.ent
index 9fe0efeefd..12ba0ae45d 100644
--- a/el_GR.ISO8859-7/share/xml/l10n.ent
+++ b/el_GR.ISO8859-7/share/xml/l10n.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-7"?>
 <!--
 
   ��������������� ��� ��������� ��������� ��� ��� HTML charset ��� �����������
diff --git a/el_GR.ISO8859-7/share/xml/mailing-lists.ent b/el_GR.ISO8859-7/share/xml/mailing-lists.ent
index b75e42da12..314654ee0d 100644
--- a/el_GR.ISO8859-7/share/xml/mailing-lists.ent
+++ b/el_GR.ISO8859-7/share/xml/mailing-lists.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-7"?>
 <!--
 
   ������� ��� ��� ������ ������������ ������������ ��� FreeBSD,
diff --git a/el_GR.ISO8859-7/share/xml/newsgroups.ent b/el_GR.ISO8859-7/share/xml/newsgroups.ent
index b937d55599..b43cf09bb9 100644
--- a/el_GR.ISO8859-7/share/xml/newsgroups.ent
+++ b/el_GR.ISO8859-7/share/xml/newsgroups.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-7"?>
 <!--
 
   ������� ������ ���������� Usenet ��� �� FreeBSD
diff --git a/el_GR.ISO8859-7/share/xml/teams.ent b/el_GR.ISO8859-7/share/xml/teams.ent
index 54a2782dac..4465078694 100644
--- a/el_GR.ISO8859-7/share/xml/teams.ent
+++ b/el_GR.ISO8859-7/share/xml/teams.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-7"?>
 <!--
 
   �� ������� ��� �� ���������� ��� ������ ��� ����� ������������
diff --git a/el_GR.ISO8859-7/share/xml/trademarks.ent b/el_GR.ISO8859-7/share/xml/trademarks.ent
index 520d80b930..a9aa5958de 100644
--- a/el_GR.ISO8859-7/share/xml/trademarks.ent
+++ b/el_GR.ISO8859-7/share/xml/trademarks.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-7"?>
 <!--
 
   ����� ������������� �������� ��� ��������� ��������, ���� ���������
diff --git a/el_GR.ISO8859-7/share/xml/translators.ent b/el_GR.ISO8859-7/share/xml/translators.ent
index 90b9e081d8..e851501192 100644
--- a/el_GR.ISO8859-7/share/xml/translators.ent
+++ b/el_GR.ISO8859-7/share/xml/translators.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-7"?>
 <!--
 
   ������� ��� ����������� ������������ ������������� ��� ����� ���
diff --git a/el_GR.ISO8859-7/share/xml/urls.ent b/el_GR.ISO8859-7/share/xml/urls.ent
index 8658f8c6de..365c42d573 100644
--- a/el_GR.ISO8859-7/share/xml/urls.ent
+++ b/el_GR.ISO8859-7/share/xml/urls.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-7"?>
 <!--
 
   URLs ��� ����� ����� ���� �� ��� �������� ���������� ��� FreeBSD.
diff --git a/en_US.ISO8859-1/share/xml/entities.ent b/en_US.ISO8859-1/share/xml/entities.ent
index fe8eb023c8..5a6913e47e 100644
--- a/en_US.ISO8859-1/share/xml/entities.ent
+++ b/en_US.ISO8859-1/share/xml/entities.ent
@@ -3,23 +3,30 @@
 <!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
 	"l10n.ent">
 %l10n;
-<!ENTITY % l10n-common PUBLIC "-//FreeBSD//ENTITIES DocBook Language Neutral Entities//EN">
-%l10n-common;
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
+<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN"
+	"man.ent">
 %man;
-<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN">
+<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN"
+	"freebsd.ent">
 %freebsd;
-<!ENTITY % glossary PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//EN">
+<!ENTITY % glossary PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//EN"
+	"glossary.ent">
 %glossary;
-<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN">
+<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN"
+	"authors.ent">
 %authors;
-<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//EN">
+<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//EN"
+	"teams.ent">
 %teams;
-<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//EN">
+<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//EN"
+	"mailing-lists.ent">
 %mailing-lists;
-<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//EN">
+<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//EN"
+	"newsgroups.ent">
 %newsgroups;
-<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">
+<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN"
+	"trademarks.ent">
 %trademarks;
-<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN">
+<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN"
+	"urls.ent">
 %urls;
diff --git a/es_ES.ISO8859-1/share/xml/entities.ent b/es_ES.ISO8859-1/share/xml/entities.ent
index efe217eed8..11499c8a0a 100644
--- a/es_ES.ISO8859-1/share/xml/entities.ent
+++ b/es_ES.ISO8859-1/share/xml/entities.ent
@@ -2,29 +2,39 @@
 	$FreeBSD$
 -->
 
-<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN">
+<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
+	"l10n.ent">
 %l10n;
-<!ENTITY % l10n-common PUBLIC "-//FreeBSD//ENTITIES DocBook Language Neutral Entities//EN">
-%l10n-common;
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
+<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN"
+	"nonexistent">
 %man;
-<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN">
+<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN"
+	"nonexistent">
 %freebsd;
-<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN">
+<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN"
+	"nonexistent">
 %authors;
-<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//ES">
+<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//ES"
+	"teams.ent">
 %teams;
-<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//ES">
+<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//ES"
+	"mailing-lists.ent">
 %mailing-lists;
-<!ENTITY % es-mailing-lists PUBLIC  "-//FreeBSD//ENTITIES DocBook Spanish Mailing List Entities//ES">
+<!ENTITY % es-mailing-lists PUBLIC  "-//FreeBSD//ENTITIES DocBook Spanish Mailing List Entities//ES"
+	"es-mailing-lists.ent">
 %es-mailing-lists;
-<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//ES">
+<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//ES"
+	"newsgroups.ent">
 %newsgroups;
-<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//ES">
+<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//ES"
+	"trademarks.ent">
 %trademarks;
-<!ENTITY % translators PUBLIC "-//FreeBSD//ENTITIES DocBook Translator Entities//ES">
+<!ENTITY % translators PUBLIC "-//FreeBSD//ENTITIES DocBook Translator Entities//ES"
+	"translators.ent">
 %translators;
-<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN">
+<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN"
+	"nonexistent">
 %urls;
-<!ENTITY % glossary PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//ES">
+<!ENTITY % glossary PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//ES"
+	"glossary.ent">
 %glossary;
diff --git a/es_ES.ISO8859-1/share/xml/es-mailing-lists.ent b/es_ES.ISO8859-1/share/xml/es-mailing-lists.ent
index 5183360936..17a24c6e09 100644
--- a/es_ES.ISO8859-1/share/xml/es-mailing-lists.ent
+++ b/es_ES.ISO8859-1/share/xml/es-mailing-lists.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
     Listas de correo oficiales de FreeBSD en castellano.
 
diff --git a/es_ES.ISO8859-1/share/xml/l10n.ent b/es_ES.ISO8859-1/share/xml/l10n.ent
index 61b5e9d79c..891c4a7cee 100644
--- a/es_ES.ISO8859-1/share/xml/l10n.ent
+++ b/es_ES.ISO8859-1/share/xml/l10n.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!-- -*- sgml -*-
      DocBook Language Specific Entities for Localization (es).
 
diff --git a/es_ES.ISO8859-1/share/xml/mailing-lists.ent b/es_ES.ISO8859-1/share/xml/mailing-lists.ent
index 0cce7a953a..cd219e1139 100755
--- a/es_ES.ISO8859-1/share/xml/mailing-lists.ent
+++ b/es_ES.ISO8859-1/share/xml/mailing-lists.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      Nombres de las listas de correo de FreeBSD y software relacionado.
 
diff --git a/es_ES.ISO8859-1/share/xml/newsgroups.ent b/es_ES.ISO8859-1/share/xml/newsgroups.ent
index add9889dfb..22c0898e7c 100644
--- a/es_ES.ISO8859-1/share/xml/newsgroups.ent
+++ b/es_ES.ISO8859-1/share/xml/newsgroups.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      Nombres de los grupos de noticias de FreeBSD
 
diff --git a/es_ES.ISO8859-1/share/xml/teams.ent b/es_ES.ISO8859-1/share/xml/teams.ent
index 8e43da6f0a..2228734cd5 100644
--- a/es_ES.ISO8859-1/share/xml/teams.ent
+++ b/es_ES.ISO8859-1/share/xml/teams.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      Names and email address of teams of people working on specified
      tasks. Usally they're just mail aliases set up at hub.FreeBSD.org
diff --git a/es_ES.ISO8859-1/share/xml/trademarks.ent b/es_ES.ISO8859-1/share/xml/trademarks.ent
index 0417ce6cf8..3d2ed3c283 100644
--- a/es_ES.ISO8859-1/share/xml/trademarks.ent
+++ b/es_ES.ISO8859-1/share/xml/trademarks.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      Trademark Legend, as required by The Open Group, Sun, etc..
 
diff --git a/es_ES.ISO8859-1/share/xml/translators.ent b/es_ES.ISO8859-1/share/xml/translators.ent
index 4045e9ff6d..5d3f1384ac 100644
--- a/es_ES.ISO8859-1/share/xml/translators.ent
+++ b/es_ES.ISO8859-1/share/xml/translators.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
       The FreeBSD Spanish Documentation Project
 
diff --git a/fr_FR.ISO8859-1/share/xml/abstract.ent b/fr_FR.ISO8859-1/share/xml/abstract.ent
index a4e8a1e907..2d75349f46 100644
--- a/fr_FR.ISO8859-1/share/xml/abstract.ent
+++ b/fr_FR.ISO8859-1/share/xml/abstract.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD French Documentation Project
diff --git a/fr_FR.ISO8859-1/share/xml/artheader.ent b/fr_FR.ISO8859-1/share/xml/artheader.ent
index 76c9b9f728..36d17523ae 100644
--- a/fr_FR.ISO8859-1/share/xml/artheader.ent
+++ b/fr_FR.ISO8859-1/share/xml/artheader.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD French Documentation Project
diff --git a/fr_FR.ISO8859-1/share/xml/entities.ent b/fr_FR.ISO8859-1/share/xml/entities.ent
index e2cc626105..30ac9f08ed 100644
--- a/fr_FR.ISO8859-1/share/xml/entities.ent
+++ b/fr_FR.ISO8859-1/share/xml/entities.ent
@@ -2,37 +2,50 @@
   Original revision: 1.2
 -->
 
-<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN">
+<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
+	"l10n.ent">
 %l10n;
-<!ENTITY % l10n-common PUBLIC "-//FreeBSD//ENTITIES DocBook Language Neutral Entities//EN">
-%l10n-common;
-<!ENTITY % translators PUBLIC "-//FreeBSD//ENTITIES DocBook Translator Entities//FR">
+<!ENTITY % translators PUBLIC "-//FreeBSD//ENTITIES DocBook Translator Entities//FR"
+	"translators.ent">
 %translators;
-<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//FR">
+<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//FR"
+	"mailing-lists.ent">
 %mailing-lists;
-<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//FR">
+<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//FR"
+	"teams.ent">
 %teams;
-<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//FR">
+<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//FR"
+	"newsgroups.ent">
 %newsgroups;
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
+<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN"
+	"nonexistent">
 %man;
-<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN">
+<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN"
+	"nonexistent">
 %freebsd;
-<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN">
+<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN"
+	"nonexistent">
 %authors;
-<!ENTITY % glossary PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//FR">
+<!ENTITY % glossary PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//FR"
+	"glossary.ent">
 %glossary;
 <!--
-<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//EN">
+<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//EN"
+	"nonexistent">
 %teams;
-<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//EN">
+<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//EN"
+	"nonexistent">
 %mailing-lists;
-<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//EN">
+<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//EN"
+	"nonexistent">
 %newsgroups;
 -->
-<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">
+<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN"
+	"nonexistent">
 %trademarks;
-<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//FR">
+<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//FR"
+	"urls.ent">
 %urls;
-<!ENTITY % urls-en PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN">
+<!ENTITY % urls-en PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN"
+	"nonexistent">
 %urls-en;
diff --git a/fr_FR.ISO8859-1/share/xml/mailing-lists.ent b/fr_FR.ISO8859-1/share/xml/mailing-lists.ent
index 6d1ba10546..14c5772c09 100644
--- a/fr_FR.ISO8859-1/share/xml/mailing-lists.ent
+++ b/fr_FR.ISO8859-1/share/xml/mailing-lists.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
 	The FreeBSD Documentation Project
 	The FreeBSD French Documentation Project
diff --git a/fr_FR.ISO8859-1/share/xml/newsgroups.ent b/fr_FR.ISO8859-1/share/xml/newsgroups.ent
index 7cdc47e2dc..b336f9f126 100644
--- a/fr_FR.ISO8859-1/share/xml/newsgroups.ent
+++ b/fr_FR.ISO8859-1/share/xml/newsgroups.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD French Documentation Project
diff --git a/fr_FR.ISO8859-1/share/xml/teams.ent b/fr_FR.ISO8859-1/share/xml/teams.ent
index 184cb8e2fe..f4db86c00d 100644
--- a/fr_FR.ISO8859-1/share/xml/teams.ent
+++ b/fr_FR.ISO8859-1/share/xml/teams.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD French Documentation Project
diff --git a/fr_FR.ISO8859-1/share/xml/trademarks.ent b/fr_FR.ISO8859-1/share/xml/trademarks.ent
index 24f72ae816..4616c292ab 100644
--- a/fr_FR.ISO8859-1/share/xml/trademarks.ent
+++ b/fr_FR.ISO8859-1/share/xml/trademarks.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD French Documentation Project
diff --git a/fr_FR.ISO8859-1/share/xml/translators.ent b/fr_FR.ISO8859-1/share/xml/translators.ent
index 24f4a06bad..e65790ce54 100644
--- a/fr_FR.ISO8859-1/share/xml/translators.ent
+++ b/fr_FR.ISO8859-1/share/xml/translators.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD French Documentation Project
diff --git a/fr_FR.ISO8859-1/share/xml/urls.ent b/fr_FR.ISO8859-1/share/xml/urls.ent
index 6bcbdf8d31..2ebd4513b2 100644
--- a/fr_FR.ISO8859-1/share/xml/urls.ent
+++ b/fr_FR.ISO8859-1/share/xml/urls.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD French Documentation Project
diff --git a/hu_HU.ISO8859-2/share/xml/entities.ent b/hu_HU.ISO8859-2/share/xml/entities.ent
index c16d43fd24..9cd4155b4f 100644
--- a/hu_HU.ISO8859-2/share/xml/entities.ent
+++ b/hu_HU.ISO8859-2/share/xml/entities.ent
@@ -5,27 +5,36 @@
      %SRCID%	1.2
 -->
 
-<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN">
+<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
+	"l10n.ent">
 %l10n;
-<!ENTITY % l10n-common PUBLIC "-//FreeBSD//ENTITIES DocBook Language Neutral Entities//EN">
-%l10n-common;
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
+<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN"
+	"nonexistent">
 %man;
-<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//HU">
+<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//HU"
+	"freebsd.ent">
 %freebsd;
-<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN">
+<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN"
+	"nonexistent">
 %authors;
-<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//HU">
+<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//HU"
+	"teams.ent">
 %teams;
-<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//HU">
+<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//HU"
+	"mailing-lists.ent">
 %mailing-lists;
-<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//HU">
+<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//HU"
+	"newsgroups.ent">
 %newsgroups;
-<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//HU">
+<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//HU"
+	"trademarks.ent">
 %trademarks;
-<!ENTITY % translators PUBLIC "-//FreeBSD//ENTITIES DocBook Translator Entities//HU">
+<!ENTITY % translators PUBLIC "-//FreeBSD//ENTITIES DocBook Translator Entities//HU"
+	"translators.ent">
 %translators;
-<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN">
+<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN"
+	"nonexistent">
 %urls;
-<!ENTITY % glossary PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//HU">
+<!ENTITY % glossary PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//HU"
+	"glossary.ent">
 %glossary;
diff --git a/hu_HU.ISO8859-2/share/xml/freebsd.ent b/hu_HU.ISO8859-2/share/xml/freebsd.ent
index be9b49e4e5..0f05aae175 100644
--- a/hu_HU.ISO8859-2/share/xml/freebsd.ent
+++ b/hu_HU.ISO8859-2/share/xml/freebsd.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-2"?>
 <!-- -*- sgml -*-
      DocBook Miscellaneous FreeBSD Entities.
 
diff --git a/hu_HU.ISO8859-2/share/xml/l10n.ent b/hu_HU.ISO8859-2/share/xml/l10n.ent
index fcf514af55..5412f263c2 100644
--- a/hu_HU.ISO8859-2/share/xml/l10n.ent
+++ b/hu_HU.ISO8859-2/share/xml/l10n.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-2"?>
 <!-- -*- sgml -*-
      DocBook Language Specific Entities for Localization (hu).
 
diff --git a/hu_HU.ISO8859-2/share/xml/mailing-lists.ent b/hu_HU.ISO8859-2/share/xml/mailing-lists.ent
index f6d57d919b..61952e93c8 100644
--- a/hu_HU.ISO8859-2/share/xml/mailing-lists.ent
+++ b/hu_HU.ISO8859-2/share/xml/mailing-lists.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-2"?>
 <!--
      Names of FreeBSD mailing lists and related software.
 
diff --git a/hu_HU.ISO8859-2/share/xml/newsgroups.ent b/hu_HU.ISO8859-2/share/xml/newsgroups.ent
index b828bf5d85..7df30d0c4f 100644
--- a/hu_HU.ISO8859-2/share/xml/newsgroups.ent
+++ b/hu_HU.ISO8859-2/share/xml/newsgroups.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-2"?>
 <!--
      Names of FreeBSD newsgroups
 
diff --git a/hu_HU.ISO8859-2/share/xml/teams.ent b/hu_HU.ISO8859-2/share/xml/teams.ent
index cb1aa614f6..9c3d708ea4 100644
--- a/hu_HU.ISO8859-2/share/xml/teams.ent
+++ b/hu_HU.ISO8859-2/share/xml/teams.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-2"?>
 <!--
      Names and email address of teams of people working on specified
      tasks. Usally they're just mail aliases set up at hub.FreeBSD.org
diff --git a/hu_HU.ISO8859-2/share/xml/trademarks.ent b/hu_HU.ISO8859-2/share/xml/trademarks.ent
index c39ebc2e4f..0047602504 100644
--- a/hu_HU.ISO8859-2/share/xml/trademarks.ent
+++ b/hu_HU.ISO8859-2/share/xml/trademarks.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-2"?>
 <!--
      Trademark Legend, as required by The Open Group, Sun, etc..
 
diff --git a/hu_HU.ISO8859-2/share/xml/translators.ent b/hu_HU.ISO8859-2/share/xml/translators.ent
index ebecb0c89f..e4fee6f43b 100644
--- a/hu_HU.ISO8859-2/share/xml/translators.ent
+++ b/hu_HU.ISO8859-2/share/xml/translators.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-2"?>
 <!--
       The FreeBSD Hungarian Documentation Project
 
diff --git a/it_IT.ISO8859-15/share/xml/entities.ent b/it_IT.ISO8859-15/share/xml/entities.ent
index dde7e8ad76..c4b4a9e7e5 100644
--- a/it_IT.ISO8859-15/share/xml/entities.ent
+++ b/it_IT.ISO8859-15/share/xml/entities.ent
@@ -4,29 +4,39 @@
       $FreeBSD$
 -->
 
-<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN">
+<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
+	"l10n.ent">
 %l10n;
-<!ENTITY % l10n-common PUBLIC "-//FreeBSD//ENTITIES DocBook Language Neutral Entities//EN">
-%l10n-common;
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
+<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN"
+	"nonexistent">
 %man;
-<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN">
+<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN"
+	"nonexistent">
 %freebsd;
-<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN">
+<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN"
+	"nonexistent">
 %authors;
-<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//EN">
+<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//EN"
+	"nonexistent">
 %teams;
-<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//IT">
+<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//IT"
+	"mailing-lists.ent">
 %mailing-lists;
-<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//EN">
+<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//EN"
+	"nonexistent">
 %newsgroups;
-<!ENTITY % it-trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//IT">
+<!ENTITY % it-trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//IT"
+	"trademarks.ent">
 %it-trademarks;
-<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">
+<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN"
+	"nonexistent">
 %trademarks;
-<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN">
+<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN"
+	"nonexistent">
 %urls;
-<!ENTITY % translators PUBLIC "-//FreeBSD//ENTITIES DocBook Translator Entities//IT">
+<!ENTITY % translators PUBLIC "-//FreeBSD//ENTITIES DocBook Translator Entities//IT"
+	"translators.ent">
 %translators;
-<!ENTITY % glossary PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//IT">
+<!ENTITY % glossary PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//IT"
+	"glossary.ent">
 %glossary;
diff --git a/it_IT.ISO8859-15/share/xml/l10n.ent b/it_IT.ISO8859-15/share/xml/l10n.ent
index aaffe110e5..d04a282367 100644
--- a/it_IT.ISO8859-15/share/xml/l10n.ent
+++ b/it_IT.ISO8859-15/share/xml/l10n.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-15"?>
 <!--
      The FreeBSD Italian Documentation Project
 
diff --git a/it_IT.ISO8859-15/share/xml/mailing-lists.ent b/it_IT.ISO8859-15/share/xml/mailing-lists.ent
index 71f549f748..f38a62b089 100644
--- a/it_IT.ISO8859-15/share/xml/mailing-lists.ent
+++ b/it_IT.ISO8859-15/share/xml/mailing-lists.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-15"?>
 <!--
      The FreeBSD Italian Documentation Project
 
diff --git a/it_IT.ISO8859-15/share/xml/trademarks.ent b/it_IT.ISO8859-15/share/xml/trademarks.ent
index 7b4b57d673..db963c92ba 100644
--- a/it_IT.ISO8859-15/share/xml/trademarks.ent
+++ b/it_IT.ISO8859-15/share/xml/trademarks.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-15"?>
 <!--
      The FreeBSD Italian Documentation Project
 
diff --git a/it_IT.ISO8859-15/share/xml/translators.ent b/it_IT.ISO8859-15/share/xml/translators.ent
index bc6fdc7abd..11ec3f45bb 100644
--- a/it_IT.ISO8859-15/share/xml/translators.ent
+++ b/it_IT.ISO8859-15/share/xml/translators.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-15"?>
 <!--
       The FreeBSD Italian Documentation Project
 
diff --git a/ja_JP.eucJP/share/xml/authors.ent b/ja_JP.eucJP/share/xml/authors.ent
index 3aa7fc4d0c..5e1b8be541 100644
--- a/ja_JP.eucJP/share/xml/authors.ent
+++ b/ja_JP.eucJP/share/xml/authors.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="euc-jp"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
diff --git a/ja_JP.eucJP/share/xml/entities.ent b/ja_JP.eucJP/share/xml/entities.ent
index 679ba28ec6..ef5b26f204 100644
--- a/ja_JP.eucJP/share/xml/entities.ent
+++ b/ja_JP.eucJP/share/xml/entities.ent
@@ -1,38 +1,51 @@
 <!-- $FreeBSD$ -->
 
-<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN">
+<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
+	"l10n.ent">
 %l10n;
-<!ENTITY % l10n-common PUBLIC "-//FreeBSD//ENTITIES DocBook Language Neutral Entities//EN">
-%l10n-common;
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
+<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN"
+	"nonexistent">
 %man;
-<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN">
+<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN"
+	"nonexistent">
 %freebsd;
-<!ENTITY % authors-ja PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//JA">
+<!ENTITY % authors-ja PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//JA"
+	"authors.ent">
 %authors-ja;
-<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN">
+<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN"
+	"nonexistent">
 %authors;
-<!ENTITY % teams-ja PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//JA">
+<!ENTITY % teams-ja PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//JA"
+	"teams.ent">
 %teams-ja;
-<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//EN">
+<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//EN"
+	"nonexistent">
 %teams;
-<!ENTITY % mailing-lists-ja PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//JA">
+<!ENTITY % mailing-lists-ja PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//JA"
+	"mailing-lists.ent">
 %mailing-lists-ja;
 <!--
-<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//EN">
+<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//EN"
+	"nonexistent">
 %mailing-lists;
 -->
-<!ENTITY % newsgroups-ja PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//JA">
+<!ENTITY % newsgroups-ja PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//JA"
+	"newsgroups.ent">
 %newsgroups-ja;
 <!--
-<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//EN">
+<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//EN"
+	"nonexistent">
 %newsgroups;
 -->
-<!ENTITY % trademarks-ja PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//JA">
+<!ENTITY % trademarks-ja PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//JA"
+	"trademarks.ent">
 %trademarks-ja;
-<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">
+<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN"
+	"nonexistent">
 %trademarks;
-<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN">
+<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN"
+	"nonexistent">
 %urls;
-<!ENTITY % glossary PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//EN">
+<!ENTITY % glossary PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//EN"
+	"nonexistent">
 %glossary;
diff --git a/ja_JP.eucJP/share/xml/mailing-lists.ent b/ja_JP.eucJP/share/xml/mailing-lists.ent
index 01db7a8bbb..238d00fc7d 100644
--- a/ja_JP.eucJP/share/xml/mailing-lists.ent
+++ b/ja_JP.eucJP/share/xml/mailing-lists.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="euc-jp"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
diff --git a/ja_JP.eucJP/share/xml/newsgroups.ent b/ja_JP.eucJP/share/xml/newsgroups.ent
index c61635ad19..577e49f89a 100644
--- a/ja_JP.eucJP/share/xml/newsgroups.ent
+++ b/ja_JP.eucJP/share/xml/newsgroups.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="euc-jp"?>
 <!--
      Names of FreeBSD newsgroups
 
diff --git a/ja_JP.eucJP/share/xml/teams.ent b/ja_JP.eucJP/share/xml/teams.ent
index 341e8610c8..d70b8b0043 100644
--- a/ja_JP.eucJP/share/xml/teams.ent
+++ b/ja_JP.eucJP/share/xml/teams.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="euc-jp"?>
 <!--
      Names and email address of teams of people working on specified
      tasks. Usally they're just mail aliases set up at hub.FreeBSD.org
diff --git a/ja_JP.eucJP/share/xml/trademarks.ent b/ja_JP.eucJP/share/xml/trademarks.ent
index 55b954d3b1..61a66d06af 100644
--- a/ja_JP.eucJP/share/xml/trademarks.ent
+++ b/ja_JP.eucJP/share/xml/trademarks.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="euc-jp"?>
 <!--
      Trademark Legend, as required by The Open Group, Sun, etc..
 
diff --git a/mn_MN.UTF-8/share/xml/entities.ent b/mn_MN.UTF-8/share/xml/entities.ent
index 3be4888484..ca664ee908 100644
--- a/mn_MN.UTF-8/share/xml/entities.ent
+++ b/mn_MN.UTF-8/share/xml/entities.ent
@@ -6,25 +6,33 @@
      $FreeBSD$
 -->
 
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
+<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN"
+	"nonexistent">
 %man;
-<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN">
+<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN"
+	"nonexistent">
 %freebsd;
-<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN">
+<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN"
+	"nonexistent">
 %authors;
-<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//MN">
+<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//MN"
+	"teams.ent">
 %teams;
-<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//MN">
+<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//MN"
+	"mailing-lists.ent">
 %mailing-lists;
-<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//MN">
+<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//MN"
+	"newsgroups.ent">
 %newsgroups;
-<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//MN">
+<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//MN"
+	"trademarks.ent">
 %trademarks;
-<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN">
+<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
+	"l10n.ent">
 %l10n;
-<!ENTITY % l10n-common PUBLIC "-//FreeBSD//ENTITIES DocBook Language Neutral Entities//EN">
-%l10n-common;
-<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN">
+<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN"
+	"nonexistent">
 %urls;
-<!ENTITY % glossary PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//MN">
+<!ENTITY % glossary PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//MN"
+	"glossary.ent">
 %glossary;
diff --git a/nl_NL.ISO8859-1/share/xml/entities.ent b/nl_NL.ISO8859-1/share/xml/entities.ent
index c71505e04a..bd9c5e799f 100644
--- a/nl_NL.ISO8859-1/share/xml/entities.ent
+++ b/nl_NL.ISO8859-1/share/xml/entities.ent
@@ -6,27 +6,36 @@
      %SRCID%	39534
 -->
 
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
+<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN"
+	"nonexistent">
 %man;
-<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN">
+<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN"
+	"nonexistent">
 %freebsd;
-<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN">
+<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN"
+	"nonexistent">
 %authors;
-<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//NL">
+<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//NL"
+	"teams.ent">
 %teams;
-<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//NL">
+<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//NL"
+	"mailing-lists.ent">
 %mailing-lists;
-<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//NL">
+<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//NL"
+	"newsgroups.ent">
 %newsgroups;
-<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//NL">
+<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//NL"
+	"trademarks.ent">
 %trademarks;
-<!ENTITY % trademarks-en PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">
+<!ENTITY % trademarks-en PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN"
+	"nonexistent">
 %trademarks-en;
-<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN">
+<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN"
+	"nonexistent">
 %urls;
-<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN">
+<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
+	"l10n.ent">
 %l10n;
-<!ENTITY % l10n-common PUBLIC "-//FreeBSD//ENTITIES DocBook Language Neutral Entities//EN">
-%l10n-common;
-<!ENTITY % glossary PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//NL">
+<!ENTITY % glossary PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//NL"
+	"glossary.ent">
 %glossary;
diff --git a/nl_NL.ISO8859-1/share/xml/l10n.ent b/nl_NL.ISO8859-1/share/xml/l10n.ent
index 6db02c97cd..961f04f440 100644
--- a/nl_NL.ISO8859-1/share/xml/l10n.ent
+++ b/nl_NL.ISO8859-1/share/xml/l10n.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!-- -*- sgml -*-
      DocBook Language Specific Entities for Localization (nl).
 
diff --git a/nl_NL.ISO8859-1/share/xml/mailing-lists.ent b/nl_NL.ISO8859-1/share/xml/mailing-lists.ent
index a0749a0266..b7cd210445 100644
--- a/nl_NL.ISO8859-1/share/xml/mailing-lists.ent
+++ b/nl_NL.ISO8859-1/share/xml/mailing-lists.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
     Namen van FreeBSD mailinglijsten en gerelateerde software.
 
diff --git a/nl_NL.ISO8859-1/share/xml/newsgroups.ent b/nl_NL.ISO8859-1/share/xml/newsgroups.ent
index e18e8d626c..a7006af3ea 100644
--- a/nl_NL.ISO8859-1/share/xml/newsgroups.ent
+++ b/nl_NL.ISO8859-1/share/xml/newsgroups.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Dutch Documentation Project
      Namen van FreeBSD newsgroepen
diff --git a/nl_NL.ISO8859-1/share/xml/teams.ent b/nl_NL.ISO8859-1/share/xml/teams.ent
index a221f2af03..9bffb92d66 100644
--- a/nl_NL.ISO8859-1/share/xml/teams.ent
+++ b/nl_NL.ISO8859-1/share/xml/teams.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Dutch Documentation Project
 
diff --git a/nl_NL.ISO8859-1/share/xml/trademarks.ent b/nl_NL.ISO8859-1/share/xml/trademarks.ent
index 0a6aa354a7..2d3d32eacb 100644
--- a/nl_NL.ISO8859-1/share/xml/trademarks.ent
+++ b/nl_NL.ISO8859-1/share/xml/trademarks.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      Legenda van handelsmerken, zoals vereist door The Open Group, Sun,
      enzovoorts.
diff --git a/nl_NL.ISO8859-1/share/xml/translators.ent b/nl_NL.ISO8859-1/share/xml/translators.ent
index 99c1c391e0..b250b910c6 100644
--- a/nl_NL.ISO8859-1/share/xml/translators.ent
+++ b/nl_NL.ISO8859-1/share/xml/translators.ent
@@ -1,5 +1,5 @@
-<!--
-      The FreeBSD Documentation Project
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!-- The FreeBSD Documentation Project 
 
       Nederlandse vertalers
       $FreeBSD$
diff --git a/pl_PL.ISO8859-2/share/xml/entities.ent b/pl_PL.ISO8859-2/share/xml/entities.ent
index 06a3061827..7ec7b52fc2 100644
--- a/pl_PL.ISO8859-2/share/xml/entities.ent
+++ b/pl_PL.ISO8859-2/share/xml/entities.ent
@@ -5,27 +5,36 @@
      Original revision: 1.2
 -->
 
-<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN">
+<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
+	"l10n.ent">
 %l10n;
-<!ENTITY % l10n-common PUBLIC "-//FreeBSD//ENTITIES DocBook Language Neutral Entities//EN">
-%l10n-common;
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
+<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN"
+	"nonexistent">
 %man;
-<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN">
+<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN"
+	"nonexistent">
 %freebsd;
-<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN">
+<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN"
+	"nonexistent">
 %authors;
-<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//PL">
+<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//PL"
+	"teams.ent">
 %teams;
-<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//PL">
+<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//PL"
+	"mailing-lists.ent">
 %mailing-lists;
-<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//PL">
+<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//PL"
+	"newsgroups.ent">
 %newsgroups;
-<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//PL">
+<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//PL"
+	"trademarks.ent">
 %trademarks;
-<!ENTITY % trademarks-en PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">
+<!ENTITY % trademarks-en PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN"
+	"nonexistent">
 %trademarks-en;
-<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN">
+<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN"
+	"nonexistent">
 %urls;
-<!ENTITY % glossary PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//EN">
+<!ENTITY % glossary PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//EN"
+	"nonexistent">
 %glossary;
diff --git a/pl_PL.ISO8859-2/share/xml/l10n.ent b/pl_PL.ISO8859-2/share/xml/l10n.ent
index 7747ee9a49..de4a4227a7 100644
--- a/pl_PL.ISO8859-2/share/xml/l10n.ent
+++ b/pl_PL.ISO8859-2/share/xml/l10n.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-2"?>
 <!-- -*- sgml -*-
      DocBook Language Specific Entities for Localization (pl).
 
diff --git a/pl_PL.ISO8859-2/share/xml/mailing-lists.ent b/pl_PL.ISO8859-2/share/xml/mailing-lists.ent
index 5225fccdda..fb51733752 100644
--- a/pl_PL.ISO8859-2/share/xml/mailing-lists.ent
+++ b/pl_PL.ISO8859-2/share/xml/mailing-lists.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-2"?>
 <!--
      Names of FreeBSD mailing lists and related software.
 
diff --git a/pl_PL.ISO8859-2/share/xml/newsgroups.ent b/pl_PL.ISO8859-2/share/xml/newsgroups.ent
index e47d2189a1..97f1cc297b 100644
--- a/pl_PL.ISO8859-2/share/xml/newsgroups.ent
+++ b/pl_PL.ISO8859-2/share/xml/newsgroups.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-2"?>
 <!--
      The FreeBSD Polish Documentation Project
 
diff --git a/pl_PL.ISO8859-2/share/xml/teams.ent b/pl_PL.ISO8859-2/share/xml/teams.ent
index a02f7d3e24..22a7b92716 100644
--- a/pl_PL.ISO8859-2/share/xml/teams.ent
+++ b/pl_PL.ISO8859-2/share/xml/teams.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-2"?>
 <!--
      The FreeBSD Polish Documentation Project
 
diff --git a/pt_BR.ISO8859-1/share/xml/entities.ent b/pt_BR.ISO8859-1/share/xml/entities.ent
index 87648dace0..6460afbca2 100644
--- a/pt_BR.ISO8859-1/share/xml/entities.ent
+++ b/pt_BR.ISO8859-1/share/xml/entities.ent
@@ -1,27 +1,39 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!-- $FreeBSD$ -->
 
-<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN">
+<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN"
+	"nonexistent">
 %authors;
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
+<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN"
+	"nonexistent">
 %man;
-<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN">
+<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN"
+	"nonexistent">
 %freebsd;
-<!ENTITY % translators PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//PT">
+<!ENTITY % translators PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//PT"
+	"translators.ent">
 %translators;
-<!ENTITY % words PUBLIC "-//FreeBSD//ENTITIES DocBook Specific Word Translations Entities//PT">
+<!ENTITY % words PUBLIC "-//FreeBSD//ENTITIES DocBook Specific Word Translations Entities//PT"
+	"words.ent">
 %words;
-<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//PT">
+<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//PT"
+	"l10n.ent">
 %l10n;
-<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//PT">
+<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//PT"
+	"mailing-lists.ent">
 %mailing-lists;
-<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//PT">
+<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//PT"
+	"newsgroups.ent">
 %newsgroups;
-<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//PT">
+<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//PT"
+	"teams.ent">
 %teams;
-<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//PT">
+<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//PT"
+	"trademarks.ent">
 %trademarks;
-<!ENTITY % trademarks-en PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">
+<!ENTITY % trademarks-en PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN"
+	"nonexistent">
 %trademarks-en;
-<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN">
+<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN"
+	"nonexistent">
 %urls;
diff --git a/pt_BR.ISO8859-1/share/xml/l10n.ent b/pt_BR.ISO8859-1/share/xml/l10n.ent
index d82aec6554..6d7f8aa948 100644
--- a/pt_BR.ISO8859-1/share/xml/l10n.ent
+++ b/pt_BR.ISO8859-1/share/xml/l10n.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!-- -*- sgml -*-
      DocBook Language Specific Entities for Localization (pt_BR).
 
diff --git a/pt_BR.ISO8859-1/share/xml/mailing-lists.ent b/pt_BR.ISO8859-1/share/xml/mailing-lists.ent
index 321eb0194b..77039cc53b 100644
--- a/pt_BR.ISO8859-1/share/xml/mailing-lists.ent
+++ b/pt_BR.ISO8859-1/share/xml/mailing-lists.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
     Nomes das listas de discuss�o do FreeBSD e dos softwares
     relacionados
diff --git a/pt_BR.ISO8859-1/share/xml/newsgroups.ent b/pt_BR.ISO8859-1/share/xml/newsgroups.ent
index 2c06789b80..e55b43329b 100644
--- a/pt_BR.ISO8859-1/share/xml/newsgroups.ent
+++ b/pt_BR.ISO8859-1/share/xml/newsgroups.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      Names of FreeBSD newsgroups
 
diff --git a/pt_BR.ISO8859-1/share/xml/teams.ent b/pt_BR.ISO8859-1/share/xml/teams.ent
index 7476584e03..e1a4644091 100644
--- a/pt_BR.ISO8859-1/share/xml/teams.ent
+++ b/pt_BR.ISO8859-1/share/xml/teams.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
   Names and email address of teams of people working on specified
   tasks. Usually they're just mail aliases set up at hub.FreeBSD.org
diff --git a/pt_BR.ISO8859-1/share/xml/trademarks.ent b/pt_BR.ISO8859-1/share/xml/trademarks.ent
index 66359ab3b6..ff0b2a03cf 100644
--- a/pt_BR.ISO8859-1/share/xml/trademarks.ent
+++ b/pt_BR.ISO8859-1/share/xml/trademarks.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!-- $FreeBSD -->
 
 <!ENTITY legalnotice '
diff --git a/pt_BR.ISO8859-1/share/xml/translators.ent b/pt_BR.ISO8859-1/share/xml/translators.ent
index 99a9f543e7..d6ff0d4fb8 100644
--- a/pt_BR.ISO8859-1/share/xml/translators.ent
+++ b/pt_BR.ISO8859-1/share/xml/translators.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Brazilian Portuguese Documentation Project
diff --git a/pt_BR.ISO8859-1/share/xml/words.ent b/pt_BR.ISO8859-1/share/xml/words.ent
index 659d4513cb..e77f89d3f8 100644
--- a/pt_BR.ISO8859-1/share/xml/words.ent
+++ b/pt_BR.ISO8859-1/share/xml/words.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      Words that were deemed too controversial.  Which, therefore,
      would require several futher revisions.  Moreover, the use of
diff --git a/ru_RU.KOI8-R/share/xml/entities.ent b/ru_RU.KOI8-R/share/xml/entities.ent
index f52abd7694..40caa1f4c0 100644
--- a/ru_RU.KOI8-R/share/xml/entities.ent
+++ b/ru_RU.KOI8-R/share/xml/entities.ent
@@ -7,27 +7,36 @@
      Original revision: 1.1 (doc/share/xml)
 -->
 
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
+<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN"
+	"nonexistent">
 %man;
-<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN">
+<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN"
+	"nonexistent">
 %freebsd;
-<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN">
+<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN"
+	"nonexistent">
 %authors;
-<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//RU">
+<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//RU"
+	"teams.ent">
 %teams;
-<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//RU">
+<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//RU"
+	"mailing-lists.ent">
 %mailing-lists;
-<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//RU">
+<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//RU"
+	"newsgroups.ent">
 %newsgroups;
-<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//RU">
+<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//RU"
+	"trademarks.ent">
 %trademarks;
-<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN">
+<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
+	"l10n.ent">
 %l10n;
-<!ENTITY % l10n-common PUBLIC "-//FreeBSD//ENTITIES DocBook Language Neutral Entities//EN">
-%l10n-common;
-<!ENTITY % urls-ru PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//RU">
+<!ENTITY % urls-ru PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//RU"
+	"urls.ent">
 %urls-ru;
-<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN">
+<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN"
+	"nonexistent">
 %urls;
-<!ENTITY % glossary PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//RU">
+<!ENTITY % glossary PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//RU"
+	"glossary.ent">
 %glossary;
diff --git a/ru_RU.KOI8-R/share/xml/mailing-lists.ent b/ru_RU.KOI8-R/share/xml/mailing-lists.ent
index d70d70647b..0876938c78 100644
--- a/ru_RU.KOI8-R/share/xml/mailing-lists.ent
+++ b/ru_RU.KOI8-R/share/xml/mailing-lists.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="koi8-r"?>
 <!--
      The FreeBSD Russian Documentation Project
 
diff --git a/ru_RU.KOI8-R/share/xml/newsgroups.ent b/ru_RU.KOI8-R/share/xml/newsgroups.ent
index 5bd404da20..20ab5d4032 100644
--- a/ru_RU.KOI8-R/share/xml/newsgroups.ent
+++ b/ru_RU.KOI8-R/share/xml/newsgroups.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="koi8-r"?>
 <!--
      The FreeBSD Russian Documentation Project
 
diff --git a/ru_RU.KOI8-R/share/xml/teams.ent b/ru_RU.KOI8-R/share/xml/teams.ent
index 9347d7aaa8..c5ad0159dc 100644
--- a/ru_RU.KOI8-R/share/xml/teams.ent
+++ b/ru_RU.KOI8-R/share/xml/teams.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="koi8-r"?>
 <!--
      The FreeBSD Russian Documentation Project
 
diff --git a/ru_RU.KOI8-R/share/xml/trademarks.ent b/ru_RU.KOI8-R/share/xml/trademarks.ent
index 83bbfc794e..c9dae8b297 100644
--- a/ru_RU.KOI8-R/share/xml/trademarks.ent
+++ b/ru_RU.KOI8-R/share/xml/trademarks.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="koi8-r"?>
 <!--
      The FreeBSD Russian Documentation Project
 
diff --git a/ru_RU.KOI8-R/share/xml/translators.ent b/ru_RU.KOI8-R/share/xml/translators.ent
index a20272f125..718b2f7e58 100644
--- a/ru_RU.KOI8-R/share/xml/translators.ent
+++ b/ru_RU.KOI8-R/share/xml/translators.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="koi8-r"?>
 <!--
      The FreeBSD Russian Documentation Project
 
diff --git a/ru_RU.KOI8-R/share/xml/urls.ent b/ru_RU.KOI8-R/share/xml/urls.ent
index 644605a719..d7112a8543 100644
--- a/ru_RU.KOI8-R/share/xml/urls.ent
+++ b/ru_RU.KOI8-R/share/xml/urls.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="koi8-r"?>
 <!--
     The FreeBSD Russian Documentation Project
 
diff --git a/sr_YU.ISO8859-2/share/xml/entities.ent b/sr_YU.ISO8859-2/share/xml/entities.ent
index 1e953d7362..a92856522b 100644
--- a/sr_YU.ISO8859-2/share/xml/entities.ent
+++ b/sr_YU.ISO8859-2/share/xml/entities.ent
@@ -1,19 +1,27 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!-- $FreeBSD$ -->
 
-<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN">
+<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN"
+	"nonexistent">
 %authors;
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
+<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN"
+	"nonexistent">
 %man;
-<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN">
+<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN"
+	"nonexistent">
 %freebsd;
-<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN">
+<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
+	"l10n.ent">
 %l10n;
-<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//EN">
+<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//EN"
+	"nonexistent">
 %mailing-lists;
-<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//EN">
+<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//EN"
+	"nonexistent">
 %newsgroups;
-<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//EN">
+<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//EN"
+	"nonexistent">
 %teams;
-<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">
+<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN"
+	"nonexistent">
 %trademarks;
diff --git a/tr_TR.ISO8859-9/share/xml/entities.ent b/tr_TR.ISO8859-9/share/xml/entities.ent
index 1e953d7362..a92856522b 100644
--- a/tr_TR.ISO8859-9/share/xml/entities.ent
+++ b/tr_TR.ISO8859-9/share/xml/entities.ent
@@ -1,19 +1,27 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!-- $FreeBSD$ -->
 
-<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN">
+<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN"
+	"nonexistent">
 %authors;
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
+<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN"
+	"nonexistent">
 %man;
-<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN">
+<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN"
+	"nonexistent">
 %freebsd;
-<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN">
+<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
+	"l10n.ent">
 %l10n;
-<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//EN">
+<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//EN"
+	"nonexistent">
 %mailing-lists;
-<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//EN">
+<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//EN"
+	"nonexistent">
 %newsgroups;
-<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//EN">
+<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//EN"
+	"nonexistent">
 %teams;
-<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">
+<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN"
+	"nonexistent">
 %trademarks;
diff --git a/zh_CN.GB2312/share/xml/authors-in-author-tag.ent b/zh_CN.GB2312/share/xml/authors-in-author-tag.ent
index 793b9a0bdf..ddd53cb661 100644
--- a/zh_CN.GB2312/share/xml/authors-in-author-tag.ent
+++ b/zh_CN.GB2312/share/xml/authors-in-author-tag.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="gb2312"?>
 <!--
      The FreeBSD Simplified Chinese Documentation Project
 
diff --git a/zh_CN.GB2312/share/xml/authors.ent b/zh_CN.GB2312/share/xml/authors.ent
index cdfd441f37..efd44a5ebf 100644
--- a/zh_CN.GB2312/share/xml/authors.ent
+++ b/zh_CN.GB2312/share/xml/authors.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="gb2312"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Simplified Chinese Documentation Project
diff --git a/zh_CN.GB2312/share/xml/entities.ent b/zh_CN.GB2312/share/xml/entities.ent
index b025010020..cd2064caef 100644
--- a/zh_CN.GB2312/share/xml/entities.ent
+++ b/zh_CN.GB2312/share/xml/entities.ent
@@ -1,28 +1,38 @@
 <!-- $FreeBSD$ -->
 
-<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN">
+<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
+	"l10n.ent">
 %l10n;
-<!ENTITY % l10n-common PUBLIC "-//FreeBSD//ENTITIES DocBook Language Neutral Entities//EN">
-%l10n-common;
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
+<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN"
+	"nonexistent">
 %man;
-<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN">
+<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN"
+	"nonexistent">
 %freebsd;
-<!ENTITY % authors.cn PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//ZH">
+<!ENTITY % authors.cn PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//ZH"
+	"authors.ent">
 %authors.cn;
-<!ENTITY % authors.in.author.tag.cn PUBLIC "-//FreeBSD//ENTITIES DocBook Author In Author Tag Entities//ZH">
+<!ENTITY % authors.in.author.tag.cn PUBLIC "-//FreeBSD//ENTITIES DocBook Author In Author Tag Entities//ZH"
+	"authors-in-author-tag.ent">
 %authors.in.author.tag.cn;
-<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN">
+<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN"
+	"nonexistent">
 %authors;
-<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//ZH">
+<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//ZH"
+	"teams.ent">
 %teams;
-<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//ZH">
+<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//ZH"
+	"mailing-lists.ent">
 %mailing-lists;
-<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//EN">
+<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//EN"
+	"nonexistent">
 %newsgroups;
-<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//ZH">
+<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//ZH"
+	"trademarks.ent">
 %trademarks;
-<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN">
+<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN"
+	"nonexistent">
 %urls;
-<!ENTITY % glossary PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//ZH">
+<!ENTITY % glossary PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//ZH"
+	"glossary.ent">
 %glossary;
diff --git a/zh_CN.GB2312/share/xml/mailing-lists.ent b/zh_CN.GB2312/share/xml/mailing-lists.ent
index fd8b8b177c..b19148ecd8 100644
--- a/zh_CN.GB2312/share/xml/mailing-lists.ent
+++ b/zh_CN.GB2312/share/xml/mailing-lists.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="gb2312"?>
 <!--
      Names of FreeBSD mailing lists and related software.
      The FreeBSD Chinese Documentation Project
diff --git a/zh_CN.GB2312/share/xml/teams.ent b/zh_CN.GB2312/share/xml/teams.ent
index 0b4ef1c3d8..3fd0be0c2a 100644
--- a/zh_CN.GB2312/share/xml/teams.ent
+++ b/zh_CN.GB2312/share/xml/teams.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="gb2312"?>
 <!--
      Names and email address of teams of people working on specified
      tasks. Usally they're just mail aliases set up at hub.FreeBSD.org
diff --git a/zh_CN.GB2312/share/xml/trademarks.ent b/zh_CN.GB2312/share/xml/trademarks.ent
index 3b43bdbacd..adec25d2ff 100644
--- a/zh_CN.GB2312/share/xml/trademarks.ent
+++ b/zh_CN.GB2312/share/xml/trademarks.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="gb2312"?>
 <!--
      Trademark Legend, as required by The Open Group, Sun, etc..
 
diff --git a/zh_TW.Big5/share/xml/authors.ent b/zh_TW.Big5/share/xml/authors.ent
index 6041504d22..8b8e7316f8 100644
--- a/zh_TW.Big5/share/xml/authors.ent
+++ b/zh_TW.Big5/share/xml/authors.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="big5"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Traditional Chinese Documentation Project
diff --git a/zh_TW.Big5/share/xml/entities.ent b/zh_TW.Big5/share/xml/entities.ent
index f457e0dd94..24ec0e64ba 100644
--- a/zh_TW.Big5/share/xml/entities.ent
+++ b/zh_TW.Big5/share/xml/entities.ent
@@ -1,28 +1,38 @@
 <!-- $FreeBSD$ -->
 
-<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN">
+<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
+	"l10n.ent">
 %l10n;
-<!ENTITY % l10n-common PUBLIC "-//FreeBSD//ENTITIES DocBook Language Neutral Entities//EN">
-%l10n-common;
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
+<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN"
+	"nonexistent">
 %man;
-<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN">
+<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN"
+	"nonexistent">
 %freebsd;
-<!ENTITY % authors.cn PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//ZH">
+<!ENTITY % authors.cn PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//ZH"
+	"authors.ent">
 %authors.cn;
-<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN">
+<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN"
+	"nonexistent">
 %authors;
-<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//EN">
+<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//EN"
+	"nonexistent">
 %teams;
-<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//ZH">
+<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//ZH"
+	"mailing-lists.ent">
 %mailing-lists;
-<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//EN">
+<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//EN"
+	"nonexistent">
 %newsgroups;
-<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//ZH">
+<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//ZH"
+	"trademarks.ent">
 %trademarks;
-<!ENTITY % trademarks-en PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">
+<!ENTITY % trademarks-en PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN"
+	"nonexistent">
 %trademarks-en;
-<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//ZH">
+<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//ZH"
+	"urls.ent">
 %urls;
-<!ENTITY % glossary PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//ZH">
+<!ENTITY % glossary PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//ZH"
+	"glossary.ent">
 %glossary;
diff --git a/zh_TW.Big5/share/xml/mailing-lists.ent b/zh_TW.Big5/share/xml/mailing-lists.ent
index ce5c33db0d..55ba56e118 100644
--- a/zh_TW.Big5/share/xml/mailing-lists.ent
+++ b/zh_TW.Big5/share/xml/mailing-lists.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="big5"?>
 <!--
      Names of FreeBSD �l���׾�s and related software.
      The FreeBSD Traditional-Chinese Documentation Project
diff --git a/zh_TW.Big5/share/xml/trademarks.ent b/zh_TW.Big5/share/xml/trademarks.ent
index 4c8f711c85..6adf8a275f 100644
--- a/zh_TW.Big5/share/xml/trademarks.ent
+++ b/zh_TW.Big5/share/xml/trademarks.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="big5"?>
 <!--
      Trademark Legend, as required by The Open Group, Sun, etc..
 
diff --git a/zh_TW.Big5/share/xml/urls.ent b/zh_TW.Big5/share/xml/urls.ent
index 29e8b5eff2..66a5957beb 100644
--- a/zh_TW.Big5/share/xml/urls.ent
+++ b/zh_TW.Big5/share/xml/urls.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="big5"?>
 <!-- $FreeBSD$ -->
 
 <!--