diff --git a/lam/po/make_all b/lam/po/make_all
index 517adb81..cd63e535 100755
--- a/lam/po/make_all
+++ b/lam/po/make_all
@@ -22,4 +22,8 @@ echo " "
 echo "Generating Japanese translation template"
 ./make_po_jp
 tar -czf messages.po_jp.tar.gz messages.po  
+echo " "
+echo "Generating Chinese translation template"
+./make_po_zh
+tar -czf messages.po_zh.tar.gz messages.po  
 
diff --git a/lam/po/make_po_zh b/lam/po/make_po_zh
new file mode 100755
index 00000000..db7a0cbd
--- /dev/null
+++ b/lam/po/make_po_zh
@@ -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