diff --git a/etc/mtree/BSD.local.dist b/etc/mtree/BSD.local.dist
index 13a7fff87e3917..15984577288131 100644
--- a/etc/mtree/BSD.local.dist
+++ b/etc/mtree/BSD.local.dist
@@ -453,6 +453,8 @@
             ..
             zh_CN.GB18030
             ..
+            zh_CN.GB2312
+	    ..
             zh_CN.GBK
             ..
             zh_TW.Big5
diff --git a/etc/mtree/BSD.usr.dist b/etc/mtree/BSD.usr.dist
index f9017350989dad..4d6efb2a2dc45a 100644
--- a/etc/mtree/BSD.usr.dist
+++ b/etc/mtree/BSD.usr.dist
@@ -517,6 +517,8 @@
             ..
             zh_CN.GB18030      
             ..
+            zh_CN.GB2312
+	    ..
             zh_CN.GBK
             ..
             zh_TW.Big5
@@ -849,6 +851,8 @@
             ..
             zh_CN.GB18030
             ..
+            zh_CN.GB2312
+	    ..
             zh_CN.GBK
             ..
             zh_TW.Big5
diff --git a/share/colldef/Makefile b/share/colldef/Makefile
index d5b8b76d4acffa..55f77b181f8630 100644
--- a/share/colldef/Makefile
+++ b/share/colldef/Makefile
@@ -42,7 +42,7 @@ LOCALEDIR=      ${DESTDIR}/usr/share/locale
 ASCIILINKS=	am_ET.UTF-8 en_AU.US-ASCII en_CA.US-ASCII en_GB.US-ASCII \
 		en_NZ.US-ASCII en_US.US-ASCII ko_KR.CP949 ko_KR.eucKR \
 		ja_JP.eucJP ja_JP.SJIS tr_TR.ISO8859-9 zh_CN.eucCN \
-		zh_CN.GB18030 zh_CN.GBK
+		zh_CN.GB18030 zh_CN.GB2312 zh_CN.GBK
 DELINKS=	de_AT de_CH
 ZHLINKS=	zh_TW.Big5
 
diff --git a/share/mklocale/Makefile b/share/mklocale/Makefile
index a9420934a5ae84..b7a09edd8f661f 100644
--- a/share/mklocale/Makefile
+++ b/share/mklocale/Makefile
@@ -24,6 +24,7 @@ LOCALES=	am_ET.UTF-8 \
 		uk_UA.KOI8-U \
 		zh_CN.eucCN \
 		zh_CN.GB18030 \
+		zh_CN.GB2312 \
 		zh_CN.GBK \
 		zh_TW.Big5
 
diff --git a/share/monetdef/Makefile b/share/monetdef/Makefile
index f9ceae0c87ac66..a5cfc135ce58b2 100644
--- a/share/monetdef/Makefile
+++ b/share/monetdef/Makefile
@@ -54,6 +54,7 @@ LOCALES=        af_ZA.ISO8859-1 \
 		uk_UA.KOI8-U \
 		zh_CN.eucCN \
 		zh_CN.GB18030 \
+		zh_CN.GB2312 \
 		zh_TW.Big5
 
 LOCALEDIR=      ${DESTDIR}/usr/share/locale
diff --git a/share/msgdef/Makefile b/share/msgdef/Makefile
index 3b518895570c55..c9028df93c55ec 100644
--- a/share/msgdef/Makefile
+++ b/share/msgdef/Makefile
@@ -48,6 +48,7 @@ LOCALES=	af_ZA.ISO8859-1 \
 		ja_JP.SJIS \
 		zh_CN.eucCN \
 		zh_CN.GB18030 \
+		zh_CN.GB2312 \
 		zh_TW.Big5
 
 LOCALEDIR=	${DESTDIR}/usr/share/locale
diff --git a/share/numericdef/Makefile b/share/numericdef/Makefile
index f5b62fa37b7429..12337f3476fa23 100644
--- a/share/numericdef/Makefile
+++ b/share/numericdef/Makefile
@@ -56,7 +56,7 @@ IT_LINKS=	it_CH
 BE_LINKS=	nl_BE
 RU_LINKS=       ru_RU.CP1251 ru_RU.CP866 ru_RU.ISO8859-5
 UA_LINKS=       uk_UA.ISO8859-5
-CN_LINKS=       zh_CN.GB18030 zh_CN.GBK zh_TW.Big5
+CN_LINKS=       zh_CN.GB18030 zh_CN.GB2312 zh_CN.GBK zh_TW.Big5
 
 .SUFFIXES: .src .out
 
diff --git a/share/timedef/Makefile b/share/timedef/Makefile
index 1187d0e8cc4d48..2339e24d5a8aaa 100644
--- a/share/timedef/Makefile
+++ b/share/timedef/Makefile
@@ -49,6 +49,7 @@ LOCALES=	am_ET.UTF-8 \
 		uk_UA.KOI8-U \
 		zh_CN.eucCN \
 		zh_CN.GB18030 \
+		zh_CN.GB2312 \
 		zh_TW.Big5
 
 LOCALEDIR=      ${DESTDIR}/usr/share/locale