diff --git a/lam/po/make_all b/lam/po/make_all
index 634725a2..20852f35 100755
--- a/lam/po/make_all
+++ b/lam/po/make_all
@@ -12,9 +12,14 @@ echo "Generating Catalan translation template"
 tar -czf messages.po_ca.tar.gz messages.po
 echo " "
 
-echo "Generating Chinese translation template"
+echo "Generating Chinese (Traditional) translation template"
 ./make_po_zh
-tar -czf messages.po_zh.tar.gz messages.po
+tar -czf messages.po_zh_TW.tar.gz messages.po
+echo " "
+
+echo "Generating Chinese (Simplified) translation template"
+./make_po_zh_CN
+tar -czf messages.po_zh_CN.tar.gz messages.po
 echo " "
 
 echo "Generating Czech translation template"
diff --git a/lam/po/make_po_zh_CN b/lam/po/make_po_zh_CN
new file mode 100755
index 00000000..7a89f4b1
--- /dev/null
+++ b/lam/po/make_po_zh_CN
@@ -0,0 +1,10 @@
+#!/bin/bash
+# $Id$
+#
+# Copyright (C) 2007  Roland Gruber
+# This code is part of LDAP Account Manager (http://www.sourceforge.net/projects/lam)
+
+# This script is run after make_po to merge the existing Chinese translations to messages.po
+
+./make_po
+msgmerge -v ../locale/zh_CN/LC_MESSAGES/messages.po messages.po -o messages.po
diff --git a/lam/po/make_po_zh_TW b/lam/po/make_po_zh_TW
new file mode 100755
index 00000000..db7a0cbd
--- /dev/null
+++ b/lam/po/make_po_zh_TW
@@ -0,0 +1,10 @@
+#!/bin/bash
+# $Id$
+#
+# Copyright (C) 2006  Roland Gruber
+# This code is part of LDAP Account Manager (http://www.sourceforge.net/projects/lam)
+
+# This script is run after make_po to merge the existing Chinese translations to messages.po
+
+./make_po
+msgmerge -v ../locale/zh_TW/LC_MESSAGES/messages.po messages.po -o messages.po