diff --git a/share/xml/events.dtd b/share/xml/events.dtd
index c20fa66b72..c2804a8918 100644
--- a/share/xml/events.dtd
+++ b/share/xml/events.dtd
@@ -89,9 +89,14 @@
         "http://www.FreeBSD.org/XML/share/xml/iso8879.ent">
 %iso8879.ent;
 
+<!ENTITY % l10n-common.ent
+ PUBLIC "-//FreeBSD//ENTITIES FreeBSD Language Specific Common Entities//EN"
+        "http://www.FreeBSD.org/XML/share/xml/l10n-common.ent">
+%l10n-common.ent;
+
 <!ENTITY % l10n.ent
- PUBLIC "-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
-        "http://www.FreeBSD.org/XML/share/xml/l10n.ent">
+ PUBLIC "-//FreeBSD//ENTITIES FreeBSD Language Specific Entities//EN"
+        "http://www.FreeBSD.org/XML/lang/share/xml/l10n.ent">
 %l10n.ent;
 
 <!ENTITY % common.ent
diff --git a/share/xml/gallery.dtd b/share/xml/gallery.dtd
index 4f00a92af0..ceb7a8a58d 100644
--- a/share/xml/gallery.dtd
+++ b/share/xml/gallery.dtd
@@ -47,10 +47,15 @@
 %iso8879.ent;
 
 <!ENTITY % l10n.ent
- PUBLIC "-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
-        "http://www.FreeBSD.org/XML/share/xml/l10n.ent">
+ PUBLIC "-//FreeBSD//ENTITIES FreeBSD Language Specific Entities//EN"
+        "http://www.FreeBSD.org/XML/lang/share/xml/l10n.ent">
 %l10n.ent;
 
+<!ENTITY % l10n-common.ent
+ PUBLIC "-//FreeBSD//ENTITIES FreeBSD Language Specific Common Entities//EN"
+        "http://www.FreeBSD.org/XML/share/xml/l10n-common.ent">
+%l10n-common.ent;
+
 <!ENTITY % common.ent
  PUBLIC "-//FreeBSD//ENTITIES FreeBSD Common Entities//EN"
         "http://www.FreeBSD.org/XML/share/xml/common.ent">
diff --git a/share/xml/ideas.dtd b/share/xml/ideas.dtd
index 282ed00a5c..ed0feb4b34 100644
--- a/share/xml/ideas.dtd
+++ b/share/xml/ideas.dtd
@@ -38,13 +38,13 @@
 %iso8879.ent;
 
 <!ENTITY % l10n.ent
- PUBLIC "-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
+ PUBLIC "-//FreeBSD//ENTITIES FreeBSD Language Specific Entities//EN"
         "http://www.FreeBSD.org/XML/lang/share/xml/l10n.ent">
 %l10n.ent;
-
+ 
 <!ENTITY % l10n-common.ent
- PUBLIC "-//FreeBSD//ENTITIES FreeBSD L10N Common Entities//EN"
-        "http://www.FreeBSD.org/XML/share/xml/l10n.ent">
+ PUBLIC "-//FreeBSD//ENTITIES FreeBSD Language Specific Common Entities//EN"
+        "http://www.FreeBSD.org/XML/share/xml/l10n-common.ent">
 %l10n-common.ent;
 
 <!ENTITY % common.ent
diff --git a/share/xml/multimedia.dtd b/share/xml/multimedia.dtd
index 5b76eb5c22..9e73c13c64 100644
--- a/share/xml/multimedia.dtd
+++ b/share/xml/multimedia.dtd
@@ -37,13 +37,13 @@
 %iso8879.ent;
 
 <!ENTITY % l10n.ent
- PUBLIC "-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
+ PUBLIC "-//FreeBSD//ENTITIES FreeBSD Language Specific Entities//EN"
         "http://www.FreeBSD.org/XML/lang/share/xml/l10n.ent">
 %l10n.ent;
-
+ 
 <!ENTITY % l10n-common.ent
- PUBLIC "-//FreeBSD//ENTITIES FreeBSD L10N Common Entities//EN"
-        "http://www.FreeBSD.org/XML/share/xml/l10n.ent">
+ PUBLIC "-//FreeBSD//ENTITIES FreeBSD Language Specific Common Entities//EN"
+        "http://www.FreeBSD.org/XML/share/xml/l10n-common.ent">
 %l10n-common.ent;
 
 <!ENTITY % release.ent
diff --git a/share/xml/news.dtd b/share/xml/news.dtd
index 2f4083eaca..38c34bf49a 100644
--- a/share/xml/news.dtd
+++ b/share/xml/news.dtd
@@ -71,13 +71,13 @@
 %iso8879.ent;
 
 <!ENTITY % l10n.ent
- PUBLIC "-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
+ PUBLIC "-//FreeBSD//ENTITIES FreeBSD Language Specific Entities//EN"
         "http://www.FreeBSD.org/XML/lang/share/xml/l10n.ent">
 %l10n.ent;
-
+ 
 <!ENTITY % l10n-common.ent
- PUBLIC "-//FreeBSD//ENTITIES FreeBSD L10N Common Entities//EN"
-        "http://www.FreeBSD.org/XML/share/xml/l10n.ent">
+ PUBLIC "-//FreeBSD//ENTITIES FreeBSD Language Specific Common Entities//EN"
+        "http://www.FreeBSD.org/XML/share/xml/l10n-common.ent">
 %l10n-common.ent;
 
 <!ENTITY % common.ent
diff --git a/share/xml/press.dtd b/share/xml/press.dtd
index e47dc8a3a1..6056673ad9 100644
--- a/share/xml/press.dtd
+++ b/share/xml/press.dtd
@@ -62,13 +62,13 @@
 %iso8879.ent;
 
 <!ENTITY % l10n.ent
- PUBLIC "-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
+ PUBLIC "-//FreeBSD//ENTITIES FreeBSD Language Specific Entities//EN"
         "http://www.FreeBSD.org/XML/lang/share/xml/l10n.ent">
 %l10n.ent;
-
+ 
 <!ENTITY % l10n-common.ent
- PUBLIC "-//FreeBSD//ENTITIES FreeBSD L10N Common Entities//EN"
-        "http://www.FreeBSD.org/XML/share/xml/l10n.ent">
+ PUBLIC "-//FreeBSD//ENTITIES FreeBSD Language Specific Common Entities//EN"
+        "http://www.FreeBSD.org/XML/share/xml/l10n-common.ent">
 %l10n-common.ent;
 
 <!ENTITY % common.ent
diff --git a/share/xml/sitemap.dtd b/share/xml/sitemap.dtd
index 9b597b9aca..c113dff51e 100644
--- a/share/xml/sitemap.dtd
+++ b/share/xml/sitemap.dtd
@@ -27,13 +27,13 @@
 %iso8879.ent;
 
 <!ENTITY % l10n.ent
- PUBLIC "-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
+ PUBLIC "-//FreeBSD//ENTITIES FreeBSD Language Specific Entities//EN"
         "http://www.FreeBSD.org/XML/lang/share/xml/l10n.ent">
 %l10n.ent;
-
+ 
 <!ENTITY % l10n-common.ent
- PUBLIC "-//FreeBSD//ENTITIES FreeBSD L10N Common Entities//EN"
-        "http://www.FreeBSD.org/XML/share/xml/l10n.ent">
+ PUBLIC "-//FreeBSD//ENTITIES FreeBSD Language Specific Common Entities//EN"
+        "http://www.FreeBSD.org/XML/share/xml/l10n-common.ent">
 %l10n-common.ent;
 
 <!ENTITY % release.ent
diff --git a/share/xml/statusreport.dtd b/share/xml/statusreport.dtd
index 7e83bf3490..25ffb5f5d9 100644
--- a/share/xml/statusreport.dtd
+++ b/share/xml/statusreport.dtd
@@ -109,9 +109,14 @@
 %iso8879.ent;
 
 <!ENTITY % l10n.ent
- PUBLIC "-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
-        "http://www.FreeBSD.org/XML/share/xml/l10n.ent">
+ PUBLIC "-//FreeBSD//ENTITIES FreeBSD Language Specific Entities//EN"
+        "http://www.FreeBSD.org/XML/lang/share/xml/l10n.ent">
 %l10n.ent;
+ 
+<!ENTITY % l10n-common.ent
+ PUBLIC "-//FreeBSD//ENTITIES FreeBSD Language Specific Common Entities//EN"
+        "http://www.FreeBSD.org/XML/share/xml/l10n-common.ent">
+%l10n-common.ent;
 
 <!ENTITY % common.ent
  PUBLIC "-//FreeBSD//ENTITIES FreeBSD Common Entities//EN"
diff --git a/share/xml/usergroups.dtd b/share/xml/usergroups.dtd
index 579ff03445..cad4c20a04 100644
--- a/share/xml/usergroups.dtd
+++ b/share/xml/usergroups.dtd
@@ -28,10 +28,15 @@
 %iso8879.ent;
 
 <!ENTITY % l10n.ent
- PUBLIC "-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
-        "http://www.FreeBSD.org/XML/share/xml/l10n.ent">
+ PUBLIC "-//FreeBSD//ENTITIES FreeBSD Language Specific Entities//EN"
+        "http://www.FreeBSD.org/XML/lang/share/xml/l10n.ent">
 %l10n.ent;
 
+<!ENTITY % l10n-common.ent
+ PUBLIC "-//FreeBSD//ENTITIES FreeBSD Language Specific Common Entities//EN"
+        "http://www.FreeBSD.org/XML/share/xml/l10n-common.ent">
+%l10n-common.ent;
+
 <!ENTITY % common.ent
  PUBLIC "-//FreeBSD//ENTITIES FreeBSD Common Entities//EN"
         "http://www.FreeBSD.org/XML/share/xml/common.ent">