diff --git a/zh_CN.GB2312/share/sgml/catalog b/zh_CN.GB2312/share/sgml/catalog
index 92c7543c37..3ece042a38 100644
--- a/zh_CN.GB2312/share/sgml/catalog
+++ b/zh_CN.GB2312/share/sgml/catalog
@@ -1,36 +1,36 @@
   -- ...................................................................... --
   -- FreeBSD SGML Public Identifiers ...................................... --
 
   -- Original Revision: 1.5 --
   -- $FreeBSD$
   --
 
 PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
 	"freebsd.dsl"
 -- Override en_US --
 PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//EN"
 	"mailing-lists.ent"
 
 PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
 	"l10n.ent"
 -- Addition to en_US, opened in l10n.ent. --
-PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//CN"
+PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//ZH"
 	"authors.ent"
 -- Chinese-specific, opened in l10n.ent. --
-PUBLIC "-//FreeBSD//ENTITIES DocBook Author In Author Tag Entities//CN"
+PUBLIC "-//FreeBSD//ENTITIES DocBook Author In Author Tag Entities//ZH"
 	"authors-in-author-tag.ent"
 -- Override en_US --
 PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//EN"
 	"teams.ent"
 -- Override common --
 PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN"
 	"trademarks.ent"
 -- Override en_US --
 PUBLIC 	"-//FreeBSD//ENTITIES DocBook BookInfo Entities//EN"
 	"bookinfo.ent"
 --
 NOTE: Any entity can be evaluated only ONCE.
       During the course of Jade running, ONLY FIRST evaluation to an entity
       takes effect, later evaluation to the same entity will be ignored.
       It also depends on the order of parameters "-c ..../catalog".
 --
diff --git a/zh_CN.GB2312/share/sgml/l10n.ent b/zh_CN.GB2312/share/sgml/l10n.ent
index 1c605312de..bd56fc3430 100644
--- a/zh_CN.GB2312/share/sgml/l10n.ent
+++ b/zh_CN.GB2312/share/sgml/l10n.ent
@@ -1,54 +1,54 @@
 <!-- -*- sgml -*-
      DocBook Language Specific Entities for Localization (Simplified Chinese).
 
      Original Revision: 1.2
      $FreeBSD$
 -->
 
 <!-- docformat navi -->
 <!ENTITY docnavi.single-html "完整模式">
 <!ENTITY docnavi.split-html  "章节模式">
 
 <!-- charset for HTML output -->
 <!ENTITY doc.html.charset "gb2312">
 
 <!ENTITY mdash "──">
 
 <!ENTITY % output.for.print "IGNORE">
 
-<!ENTITY % authors.cn PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//CN">
+<!ENTITY % authors.cn PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//ZH">
 %authors.cn;
 
 <!ENTITY % authors.in.author.tag.cn
-    PUBLIC "-//FreeBSD//ENTITIES DocBook Author In Author Tag Entities//CN">
+    PUBLIC "-//FreeBSD//ENTITIES DocBook Author In Author Tag Entities//ZH">
 %authors.in.author.tag.cn;
 
 <!ENTITY cnproj.freebsd.org "FreeBSD 中文计划">
 
 <!ENTITY cnproj.url.base "http://www.freebsd.org.cn">
 
 <!ENTITY cnproj.contributing.to.freebsd.doc "
          这本手册还在不断由许多人<emphasis>继续书写</emphasis>。
          许多章节还是空白，有的章节亟待更新。
          如果您对这个项目感兴趣并愿意有所贡献，请发信给 &a.doc;。
 ">
 
 <!ENTITY cnproj.getting.freebsd.doc "
          本文档的最新英文原始版本可从
          <ulink url='&url.base;/index.html'>FreeBSD Web 站点</ulink> 获得，
          最新中文译本可从 <ulink url='&cnproj.url.base;/'>&cnproj.freebsd.org; Web 站点</ulink>获得。
          此外， 您也可以从
          <ulink url='ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/'>FreeBSD FTP 服务器</ulink>
          或众多的 <ulink url='&url.books.handbook;/mirrors-ftp.html'>镜像站点</ulink>
          得到这份文档的各种其他格式以及压缩形式的版本。
 ">
 
 <!ENTITY cnproj.contributed.by "供稿：">
 
 <!ENTITY cnproj.modified.for.handbook.by "改编为手册：">
 
 <!ENTITY cnproj.translated.by "翻译：">
 
 <!ENTITY cnproj.written.by "写作：">