diff --git a/src/po/Make_all.mak b/src/po/Make_all.mak
index b062bcc..8f28dfa 100644
--- a/src/po/Make_all.mak
+++ b/src/po/Make_all.mak
@@ -134,6 +134,7 @@
 		ru.cp1251.mo \
 		sk.cp1250.mo \
 		uk.cp1251.mo \
+		zh_CN.mo \
 		zh_CN.cp936.mo \
 
 
diff --git a/src/po/Makefile b/src/po/Makefile
index e46bcea..47064fd 100644
--- a/src/po/Makefile
+++ b/src/po/Makefile
@@ -132,6 +132,12 @@
 	iconv -f iso-8859-2 -t cp1250 sk.po | \
 		sed -e 's/charset=ISO-8859-2/charset=cp1250/' -e 's/# Original translations/# Generated from sk.po, DO NOT EDIT/' > sk.cp1250.po
 
+# Convert zh_CN.UTF-8.po to create zh_CN.po.
+zh_CN.po: zh_CN.UTF-8.po
+	rm -f zh_CN.po
+	iconv -f UTF-8 -t gb2312 zh_CN.UTF-8.po | \
+		sed -e 's/charset=[uU][tT][fF]-8/charset=gb2312/' -e 's/# Original translations/# Generated from zh_CN.UTF-8.po, DO NOT EDIT/' > zh_CN.po
+
 # Convert zh_CN.UTF-8.po to create zh_CN.cp936.po.
 # Set 'charset' to gbk to avoid that msfmt generates a warning.
 # This used to convert from zh_CN.po, but that results in a conversion error.
diff --git a/src/version.c b/src/version.c
index 22f0a5a..4662066 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    4380,
+/**/
     4379,
 /**/
     4378,