diff --git a/man/Makefile.am b/man/Makefile.am
index 9b45e164..e99c4df8 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -1,7 +1,7 @@
 
 # subdirectories for translated manual pages
 if USE_NLS
-SUBDIRS = po cs de es fi fr hu id it ja ko pl pt_BR ru sv tr zh_TW
+SUBDIRS = po cs de es fi fr hu id it ja ko pl pt_BR ru sv tr zh_CN zh_TW
 else
 SUBDIRS =
 endif
diff --git a/man/generate_translations.mak b/man/generate_translations.mak
index ab673694..1502422b 100644
--- a/man/generate_translations.mak
+++ b/man/generate_translations.mak
@@ -17,4 +17,4 @@ $(man_MANS):
 	@false
 endif
 
-CLEANFILES = .xml2po.mo $(EXTRA_DIST) $(addsuffix .xml,$(EXTRA_DIST))
+CLEANFILES = .xml2po.mo $(EXTRA_DIST) $(addsuffix .xml,$(EXTRA_DIST)) config.xml
diff --git a/man/po/zh_CN.po b/man/po/zh_CN.po
index 1b8eeb80..74f6c6ef 100644
--- a/man/po/zh_CN.po
+++ b/man/po/zh_CN.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: shadow-man-pages VERSION\n"
 "POT-Creation-Date: 2010-08-29 17:54+0200\n"
-"PO-Revision-Date: 2011-03-26 01:52+0800\n"
+"PO-Revision-Date: 2011-06-03 22:36+0200\n"
 "Last-Translator: YunQiang Su <wzssyqa@gmail.com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
 "Language: zh_CN\n"
@@ -6138,7 +6138,7 @@ msgstr ""
 
 #: limits.5.xml:35(refentrytitle) limits.5.xml:40(refname)
 msgid "limits"
-msgstr "限制"
+msgstr "limits"
 
 #: limits.5.xml:41(refpurpose)
 msgid "resource limits definition"
@@ -6704,7 +6704,7 @@ msgstr ""
 #: groups.1.xml:34(refentrytitle) groups.1.xml:39(refname)
 #: groups.1.xml:45(command)
 msgid "groups"
-msgstr "组"
+msgstr "groups"
 
 #: groups.1.xml:40(refpurpose)
 msgid "display current group names"
@@ -7418,7 +7418,7 @@ msgstr ""
 #: faillog.8.xml:45(command) faillog.5.xml:34(refentrytitle)
 #: faillog.5.xml:39(refname) faillog.5.xml:86(refentrytitle)
 msgid "faillog"
-msgstr "登录失败"
+msgstr "faillog"
 
 #: faillog.8.xml:40(refpurpose)
 msgid "display faillog records or set login failure limits"
@@ -7607,7 +7607,7 @@ msgstr ""
 #: expiry.1.xml:41(refentrytitle) expiry.1.xml:46(refname)
 #: expiry.1.xml:52(command)
 msgid "expiry"
-msgstr "过期"
+msgstr "expiry"
 
 #: expiry.1.xml:47(refpurpose)
 msgid "check and enforce password expiration policy"
diff --git a/man/zh_CN/Makefile.am b/man/zh_CN/Makefile.am
new file mode 100644
index 00000000..d8a111f0
--- /dev/null
+++ b/man/zh_CN/Makefile.am
@@ -0,0 +1,59 @@
+
+mandir = @mandir@/zh_CN
+
+man_MANS = \
+	chage.1 \
+	chfn.1 \
+	chpasswd.8 \
+	chsh.1 \
+	expiry.1 \
+	faillog.5 \
+	faillog.8 \
+	getspnam.3 \
+	gpasswd.1 \
+	groupadd.8 \
+	groupdel.8 \
+	groupmod.8 \
+	groups.1 \
+	grpck.8 \
+	grpconv.8 \
+	grpunconv.8 \
+	gshadow.5 \
+	lastlog.8 \
+	login.1 \
+	login.defs.5 \
+	logoutd.8 \
+	newgrp.1 \
+	newusers.8 \
+	passwd.1 \
+	passwd.5 \
+	pwck.8 \
+	pwconv.8 \
+	pwunconv.8 \
+	sg.1 \
+	shadow.3 \
+	shadow.5 \
+	su.1 \
+	suauth.5 \
+	useradd.8 \
+	userdel.8 \
+	usermod.8 \
+	vigr.8 \
+	vipw.8
+
+man_nopam = \
+	limits.5 \
+	login.access.5 \
+	porttime.5
+
+if !USE_PAM
+man_MANS += $(man_nopam)
+endif
+
+EXTRA_DIST = \
+	$(man_MANS) \
+	$(man_nopam) \
+	id.1
+
+include ../generate_translations.mak
+