diff --git a/release/doc/en_US.ISO8859-1/hardware/Makefile b/release/doc/en_US.ISO8859-1/hardware/Makefile
index 9818f8f8a2fd..464814611ff7 100644
--- a/release/doc/en_US.ISO8859-1/hardware/Makefile
+++ b/release/doc/en_US.ISO8859-1/hardware/Makefile
@@ -18,7 +18,7 @@ JADEFLAGS+=	-V %generate-article-toc%
 # SGML content
 SRCS+=	article.xml
 SRCS+=	${DEV-AUTODIR}/catalog-auto
-SRCS+=	${DEV-AUTODIR}/dev-auto.xml
+SRCS+=	${DEV-AUTODIR}/dev-auto.ent
 
 CATALOGS+=	-c ${DEV-AUTODIR}/catalog-auto
 
diff --git a/release/doc/ja_JP.eucJP/hardware/alpha/Makefile b/release/doc/ja_JP.eucJP/hardware/alpha/Makefile
index a3e402f7a8a6..de3da4399a92 100644
--- a/release/doc/ja_JP.eucJP/hardware/alpha/Makefile
+++ b/release/doc/ja_JP.eucJP/hardware/alpha/Makefile
@@ -17,8 +17,8 @@ SRCS+=	../common/hw.ent
 SRCS+=	../common/artheader.xml
 SRCS+=	../common/dev.xml
 SRCS+=	${DEV-AUTODIR}/catalog-auto
-SRCS+=	${DEV-AUTODIR}/dev-auto.xml
-SRCS+=	../../share/xml/dev-auto-ja.xml
+SRCS+=	${DEV-AUTODIR}/dev-auto.ent
+SRCS+=	../../share/xml/dev-auto-ja.ent
 
 .include "${RELN_ROOT}/share/mk/doc.relnotes.mk"
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/release/doc/ja_JP.eucJP/hardware/amd64/Makefile b/release/doc/ja_JP.eucJP/hardware/amd64/Makefile
index 9843764547f4..b65b309b5024 100644
--- a/release/doc/ja_JP.eucJP/hardware/amd64/Makefile
+++ b/release/doc/ja_JP.eucJP/hardware/amd64/Makefile
@@ -17,8 +17,8 @@ SRCS+=	../common/hw.ent
 SRCS+=	../common/artheader.xml
 SRCS+=	../common/dev.xml
 SRCS+=	${DEV-AUTODIR}/catalog-auto
-SRCS+=	${DEV-AUTODIR}/dev-auto.xml
-SRCS+=	../../share/xml/dev-auto-ja.xml
+SRCS+=	${DEV-AUTODIR}/dev-auto.ent
+SRCS+=	../../share/xml/dev-auto-ja.ent
 
 .include "${RELN_ROOT}/share/mk/doc.relnotes.mk"
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/release/doc/ja_JP.eucJP/hardware/i386/Makefile b/release/doc/ja_JP.eucJP/hardware/i386/Makefile
index 4872631ac037..a47766630f91 100644
--- a/release/doc/ja_JP.eucJP/hardware/i386/Makefile
+++ b/release/doc/ja_JP.eucJP/hardware/i386/Makefile
@@ -17,8 +17,8 @@ SRCS+=	../common/hw.ent
 SRCS+=	../common/artheader.xml
 SRCS+=	../common/dev.xml
 SRCS+=	${DEV-AUTODIR}/catalog-auto
-SRCS+=	${DEV-AUTODIR}/dev-auto.xml
-SRCS+=	../../share/xml/dev-auto-ja.xml
+SRCS+=	${DEV-AUTODIR}/dev-auto.ent
+SRCS+=	../../share/xml/dev-auto-ja.ent
 
 .include "${RELN_ROOT}/share/mk/doc.relnotes.mk"
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/release/doc/ja_JP.eucJP/hardware/ia64/Makefile b/release/doc/ja_JP.eucJP/hardware/ia64/Makefile
index c797e668a83e..227c78ec0acd 100644
--- a/release/doc/ja_JP.eucJP/hardware/ia64/Makefile
+++ b/release/doc/ja_JP.eucJP/hardware/ia64/Makefile
@@ -17,8 +17,8 @@ SRCS+=	../common/hw.ent
 SRCS+=	../common/artheader.xml
 SRCS+=	../common/dev.xml
 SRCS+=	${DEV-AUTODIR}/catalog-auto
-SRCS+=	${DEV-AUTODIR}/dev-auto.xml
-SRCS+=	../../share/xml/dev-auto-ja.xml
+SRCS+=	${DEV-AUTODIR}/dev-auto.ent
+SRCS+=	../../share/xml/dev-auto-ja.ent
 
 .include "${RELN_ROOT}/share/mk/doc.relnotes.mk"
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/release/doc/ja_JP.eucJP/hardware/pc98/Makefile b/release/doc/ja_JP.eucJP/hardware/pc98/Makefile
index 788a6e829f18..086f6304c3fd 100644
--- a/release/doc/ja_JP.eucJP/hardware/pc98/Makefile
+++ b/release/doc/ja_JP.eucJP/hardware/pc98/Makefile
@@ -17,8 +17,8 @@ SRCS+=	../common/hw.ent
 SRCS+=	../common/artheader.xml
 SRCS+=	../common/dev.xml
 SRCS+=	${DEV-AUTODIR}/catalog-auto
-SRCS+=	${DEV-AUTODIR}/dev-auto.xml
-SRCS+=	../../share/xml/dev-auto-ja.xml
+SRCS+=	${DEV-AUTODIR}/dev-auto.ent
+SRCS+=	../../share/xml/dev-auto-ja.ent
 
 .include "${RELN_ROOT}/share/mk/doc.relnotes.mk"
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/release/doc/ja_JP.eucJP/hardware/sparc64/Makefile b/release/doc/ja_JP.eucJP/hardware/sparc64/Makefile
index cd5ad68b558d..2d60aef99067 100644
--- a/release/doc/ja_JP.eucJP/hardware/sparc64/Makefile
+++ b/release/doc/ja_JP.eucJP/hardware/sparc64/Makefile
@@ -17,8 +17,8 @@ SRCS+=	../common/hw.ent
 SRCS+=	../common/artheader.xml
 SRCS+=	../common/dev.xml
 SRCS+=	${DEV-AUTODIR}/catalog-auto
-SRCS+=	${DEV-AUTODIR}/dev-auto.xml
-SRCS+=	../../share/xml/dev-auto-ja.xml
+SRCS+=	${DEV-AUTODIR}/dev-auto.ent
+SRCS+=	../../share/xml/dev-auto-ja.ent
 
 .include "${RELN_ROOT}/share/mk/doc.relnotes.mk"
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/release/doc/ja_JP.eucJP/share/xml/catalog b/release/doc/ja_JP.eucJP/share/xml/catalog
index c96f4d2df094..a217fa46b06a 100644
--- a/release/doc/ja_JP.eucJP/share/xml/catalog
+++ b/release/doc/ja_JP.eucJP/share/xml/catalog
@@ -6,7 +6,7 @@
 PUBLIC "-//FreeBSD//DOCUMENT Release Notes DocBook Stylesheet//EN"
        "release.dsl"
 PUBLIC "-//FreeBSD//ENTITIES Auto Generated Device Lists//JA"
-       "dev-auto-ja.xml"
+       "dev-auto-ja.ent"
 
 
 
diff --git a/release/doc/ja_JP.eucJP/share/xml/catalog.xml b/release/doc/ja_JP.eucJP/share/xml/catalog.xml
index 96a961d86bb4..5bc1960d3a40 100644
--- a/release/doc/ja_JP.eucJP/share/xml/catalog.xml
+++ b/release/doc/ja_JP.eucJP/share/xml/catalog.xml
@@ -7,5 +7,5 @@
 <catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
   <public
         publicId="-//FreeBSD//ENTITIES Auto Generated Device Lists//JA"
-        uri="dev-auto-ja.xml"/>
+        uri="dev-auto-ja.ent"/>
 </catalog>
diff --git a/release/doc/ja_JP.eucJP/share/xml/dev-auto-ja.xml b/release/doc/ja_JP.eucJP/share/xml/dev-auto-ja.ent
similarity index 100%
rename from release/doc/ja_JP.eucJP/share/xml/dev-auto-ja.xml
rename to release/doc/ja_JP.eucJP/share/xml/dev-auto-ja.ent
diff --git a/release/doc/ru_RU.KOI8-R/hardware/alpha/Makefile b/release/doc/ru_RU.KOI8-R/hardware/alpha/Makefile
index 08d3f6af7f2f..230b26054ed6 100644
--- a/release/doc/ru_RU.KOI8-R/hardware/alpha/Makefile
+++ b/release/doc/ru_RU.KOI8-R/hardware/alpha/Makefile
@@ -21,8 +21,8 @@ SRCS+=	../common/hw.ent
 SRCS+=	../common/artheader.xml
 SRCS+=	../common/dev.xml
 SRCS+=	${DEV-AUTODIR}/catalog-auto
-SRCS+=	${DEV-AUTODIR}/dev-auto.xml
-SRCS+= ../../share/xml/dev-auto-ru.xml
+SRCS+=	${DEV-AUTODIR}/dev-auto.ent
+SRCS+= ../../share/xml/dev-auto-ru.ent
 
 .include "${RELN_ROOT}/share/mk/doc.relnotes.mk"
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/release/doc/ru_RU.KOI8-R/hardware/amd64/Makefile b/release/doc/ru_RU.KOI8-R/hardware/amd64/Makefile
index 4cc732fdeea8..d84e59e65eb3 100644
--- a/release/doc/ru_RU.KOI8-R/hardware/amd64/Makefile
+++ b/release/doc/ru_RU.KOI8-R/hardware/amd64/Makefile
@@ -21,8 +21,8 @@ SRCS+=	../common/hw.ent
 SRCS+=	../common/artheader.xml
 SRCS+=	../common/dev.xml
 SRCS+=	${DEV-AUTODIR}/catalog-auto
-SRCS+=	${DEV-AUTODIR}/dev-auto.xml
-SRCS+= ../../share/xml/dev-auto-ru.xml
+SRCS+=	${DEV-AUTODIR}/dev-auto.ent
+SRCS+= ../../share/xml/dev-auto-ru.ent
 
 .include "${RELN_ROOT}/share/mk/doc.relnotes.mk"
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/release/doc/ru_RU.KOI8-R/hardware/i386/Makefile b/release/doc/ru_RU.KOI8-R/hardware/i386/Makefile
index e8a2abc6e36c..2a3a072e4c65 100644
--- a/release/doc/ru_RU.KOI8-R/hardware/i386/Makefile
+++ b/release/doc/ru_RU.KOI8-R/hardware/i386/Makefile
@@ -21,8 +21,8 @@ SRCS+=	../common/hw.ent
 SRCS+=	../common/artheader.xml
 SRCS+=	../common/dev.xml
 SRCS+=	${DEV-AUTODIR}/catalog-auto
-SRCS+=	${DEV-AUTODIR}/dev-auto.xml
-SRCS+= ../../share/xml/dev-auto-ru.xml
+SRCS+=	${DEV-AUTODIR}/dev-auto.ent
+SRCS+= ../../share/xml/dev-auto-ru.ent
 
 .include "${RELN_ROOT}/share/mk/doc.relnotes.mk"
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/release/doc/ru_RU.KOI8-R/hardware/ia64/Makefile b/release/doc/ru_RU.KOI8-R/hardware/ia64/Makefile
index b32a22b3dc4b..b6dc7567f3f8 100644
--- a/release/doc/ru_RU.KOI8-R/hardware/ia64/Makefile
+++ b/release/doc/ru_RU.KOI8-R/hardware/ia64/Makefile
@@ -21,8 +21,8 @@ SRCS+=	../common/hw.ent
 SRCS+=	../common/artheader.xml
 SRCS+=	../common/dev.xml
 SRCS+=	${DEV-AUTODIR}/catalog-auto
-SRCS+=	${DEV-AUTODIR}/dev-auto.xml
-SRCS+= ../../share/xml/dev-auto-ru.xml
+SRCS+=	${DEV-AUTODIR}/dev-auto.ent
+SRCS+= ../../share/xml/dev-auto-ru.ent
 
 .include "${RELN_ROOT}/share/mk/doc.relnotes.mk"
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/release/doc/ru_RU.KOI8-R/hardware/pc98/Makefile b/release/doc/ru_RU.KOI8-R/hardware/pc98/Makefile
index 53b9df08af9c..b83e3520b185 100644
--- a/release/doc/ru_RU.KOI8-R/hardware/pc98/Makefile
+++ b/release/doc/ru_RU.KOI8-R/hardware/pc98/Makefile
@@ -21,8 +21,8 @@ SRCS+=	../common/hw.ent
 SRCS+=	../common/artheader.xml
 SRCS+=	../common/dev.xml
 SRCS+=	${DEV-AUTODIR}/catalog-auto
-SRCS+=	${DEV-AUTODIR}/dev-auto.xml
-SRCS+= ../../share/xml/dev-auto-ru.xml
+SRCS+=	${DEV-AUTODIR}/dev-auto.ent
+SRCS+= ../../share/xml/dev-auto-ru.ent
 
 .include "${RELN_ROOT}/share/mk/doc.relnotes.mk"
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/release/doc/ru_RU.KOI8-R/hardware/sparc64/Makefile b/release/doc/ru_RU.KOI8-R/hardware/sparc64/Makefile
index d622a6c14603..b30b3d17f300 100644
--- a/release/doc/ru_RU.KOI8-R/hardware/sparc64/Makefile
+++ b/release/doc/ru_RU.KOI8-R/hardware/sparc64/Makefile
@@ -21,8 +21,8 @@ SRCS+=	../common/hw.ent
 SRCS+=	../common/artheader.xml
 SRCS+=	../common/dev.xml
 SRCS+=	${DEV-AUTODIR}/catalog-auto
-SRCS+=	${DEV-AUTODIR}/dev-auto.xml
-SRCS+= ../../share/xml/dev-auto-ru.xml
+SRCS+=	${DEV-AUTODIR}/dev-auto.ent
+SRCS+= ../../share/xml/dev-auto-ru.ent
 
 .include "${RELN_ROOT}/share/mk/doc.relnotes.mk"
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/release/doc/ru_RU.KOI8-R/share/xml/catalog b/release/doc/ru_RU.KOI8-R/share/xml/catalog
index f4e131ec98c2..a8558b579980 100644
--- a/release/doc/ru_RU.KOI8-R/share/xml/catalog
+++ b/release/doc/ru_RU.KOI8-R/share/xml/catalog
@@ -9,4 +9,4 @@
 PUBLIC "-//FreeBSD//DOCUMENT Release Notes DocBook Stylesheet//EN"
        "release.dsl"
 PUBLIC "-//FreeBSD//ENTITIES Auto Generated Device Lists//RU"
-       "dev-auto-ru.xml"
+       "dev-auto-ru.ent"
diff --git a/release/doc/ru_RU.KOI8-R/share/xml/catalog.xml b/release/doc/ru_RU.KOI8-R/share/xml/catalog.xml
index dd196acd6ab7..f10f27360489 100644
--- a/release/doc/ru_RU.KOI8-R/share/xml/catalog.xml
+++ b/release/doc/ru_RU.KOI8-R/share/xml/catalog.xml
@@ -7,5 +7,5 @@
 <catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
   <public
         publicId="-//FreeBSD//ENTITIES Auto Generated Device Lists//RU"
-        uri="dev-auto-ru.xml"/>
+        uri="dev-auto-ru.ent"/>
 </catalog>
diff --git a/release/doc/ru_RU.KOI8-R/share/xml/dev-auto-ru.xml b/release/doc/ru_RU.KOI8-R/share/xml/dev-auto-ru.ent
similarity index 100%
rename from release/doc/ru_RU.KOI8-R/share/xml/dev-auto-ru.xml
rename to release/doc/ru_RU.KOI8-R/share/xml/dev-auto-ru.ent
diff --git a/release/doc/zh_CN.GB2312/hardware/Makefile b/release/doc/zh_CN.GB2312/hardware/Makefile
index 53037dd8ab03..710a562a41c5 100644
--- a/release/doc/zh_CN.GB2312/hardware/Makefile
+++ b/release/doc/zh_CN.GB2312/hardware/Makefile
@@ -21,7 +21,7 @@ JADEFLAGS+=	-V %generate-article-toc%
 # SGML content
 SRCS+=	article.xml
 SRCS+=	${DEV-AUTODIR}/catalog-auto
-SRCS+=	${DEV-AUTODIR}/dev-auto.xml
+SRCS+=	${DEV-AUTODIR}/dev-auto.ent
 
 CATALOGS+=	-c ${DEV-AUTODIR}/catalog-auto