diff --git a/Makefile.in b/Makefile.in
index 1f123309..43ea29c1 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -97,9 +97,9 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = ./src/config.h
 CONFIG_CLEAN_FILES = 
 DIST_COMMON =  README AUTHORS COPYING ChangeLog INSTALL Makefile.am \
-Makefile.in NEWS TODO acinclude.m4 aclocal.m4 config.guess config.sub \
-configure configure.in install-sh ltconfig ltmain.sh missing \
-mkinstalldirs
+Makefile.in NEWS TODO acconfig.h acinclude.m4 aclocal.m4 config.guess \
+config.sub configure configure.in install-sh ltconfig ltmain.sh missing \
+mkinstalldirs src/config.h.in src/stamp-h.in
 
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
@@ -123,6 +123,34 @@ config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 $(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
 	cd $(srcdir) && $(AUTOCONF)
 
+src/config.h: src/stamp-h
+	@if test ! -f $@; then \
+		rm -f src/stamp-h; \
+		$(MAKE) src/stamp-h; \
+	else :; fi
+src/stamp-h: $(srcdir)/src/config.h.in $(top_builddir)/config.status
+	cd $(top_builddir) \
+	  && CONFIG_FILES= CONFIG_HEADERS=src/config.h \
+	     $(SHELL) ./config.status
+	@echo timestamp > src/stamp-h 2> /dev/null
+$(srcdir)/src/config.h.in: $(srcdir)/src/stamp-h.in
+	@if test ! -f $@; then \
+		rm -f $(srcdir)/src/stamp-h.in; \
+		$(MAKE) $(srcdir)/src/stamp-h.in; \
+	else :; fi
+$(srcdir)/src/stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) acconfig.h
+	cd $(top_srcdir) && $(AUTOHEADER)
+	@echo timestamp > $(srcdir)/src/stamp-h.in 2> /dev/null
+
+mostlyclean-hdr:
+
+clean-hdr:
+
+distclean-hdr:
+	-rm -f src/config.h
+
+maintainer-clean-hdr:
+
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
 # To change the values of `make' variables: instead of editing Makefiles,
@@ -312,33 +340,33 @@ distclean-generic:
 	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
 
 maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-tags mostlyclean-generic
+mostlyclean-am:  mostlyclean-hdr mostlyclean-tags mostlyclean-generic
 
 mostlyclean: mostlyclean-recursive
 
-clean-am:  clean-tags clean-generic mostlyclean-am
+clean-am:  clean-hdr clean-tags clean-generic mostlyclean-am
 
 clean: clean-recursive
 
-distclean-am:  distclean-tags distclean-generic clean-am
+distclean-am:  distclean-hdr distclean-tags distclean-generic clean-am
 	-rm -f libtool
 
 distclean: distclean-recursive
 	-rm -f config.status
 
-maintainer-clean-am:  maintainer-clean-tags maintainer-clean-generic \
-		distclean-am
+maintainer-clean-am:  maintainer-clean-hdr maintainer-clean-tags \
+		maintainer-clean-generic distclean-am
 	@echo "This command is intended for maintainers to use;"
 	@echo "it deletes files that may require special tools to rebuild."
 
 maintainer-clean: maintainer-clean-recursive
 	-rm -f config.status
 
-.PHONY: install-data-recursive uninstall-data-recursive \
-install-exec-recursive uninstall-exec-recursive installdirs-recursive \
-uninstalldirs-recursive all-recursive check-recursive \
-installcheck-recursive info-recursive dvi-recursive \
-mostlyclean-recursive distclean-recursive clean-recursive \
+.PHONY: mostlyclean-hdr distclean-hdr clean-hdr maintainer-clean-hdr \
+install-data-recursive uninstall-data-recursive install-exec-recursive \
+uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \
+all-recursive check-recursive installcheck-recursive info-recursive \
+dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \
 maintainer-clean-recursive tags tags-recursive mostlyclean-tags \
 distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
 dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
diff --git a/WindowMaker/Makefile.in b/WindowMaker/Makefile.in
index 42d11b06..c2208143 100755
--- a/WindowMaker/Makefile.in
+++ b/WindowMaker/Makefile.in
@@ -92,7 +92,7 @@ SUBDIRS = Backgrounds Defaults IconSets Icons Pixmaps Styles Themes
 
 prefsdatadir = $(pkgdatadir)
 
-prefsdata_DATA =  	README 	README.themes 	autostart.sh 	exitscript.sh 	menu 	menu.ca 	menu.cz 	menu.de 	menu.dk 	menu.el 	menu.es 	menu.fi 	menu.fr 	menu.gl 	menu.he 	menu.hr 	menu.hu 	menu.it 	menu.ja 	menu.ko 	menu.nl 	menu.no 	menu.pt 	menu.ru 	menu.se 	menu.sl 	menu.tr 	menu.zh_TW.Big5 	plmenu 	plmenu.fr 	plmenu.hr 	plmenu.dk 	wmmacros 	xtree.dat
+prefsdata_DATA =  	README 	README.themes 	autostart.sh 	exitscript.sh 	menu 	menu.ca 	menu.cz 	menu.de 	menu.da 	menu.el 	menu.es 	menu.fi 	menu.fr 	menu.gl 	menu.he 	menu.hr 	menu.hu 	menu.it 	menu.ja 	menu.ko 	menu.nl 	menu.no 	menu.pt 	menu.ru 	menu.se 	menu.sl 	menu.tr 	menu.zh_TW.Big5 	plmenu 	plmenu.fr 	plmenu.hr 	plmenu.dk 	wmmacros 	xtree.dat
 
 
 EXTRA_DIST = $(prefsdata_DATA) mkMakefile
diff --git a/configure b/configure
index 0d85a6bf..a8dd1fdd 100755
--- a/configure
+++ b/configure
@@ -2986,8 +2986,8 @@ fi
 
 
 
-supported_locales="cs de es fr gl it ja ko nl no pt ru se tr fi hr el pl ro dk zh_TW.Big5"
-supported_wprefs_locales="pt hr fr ko ja cs zh_TW.Big5 es"
+supported_locales="cs de es fr gl it ja ko nl no pt ru se tr fi hr el pl ro da zh_TW.Big5 zh_CN.GB2312"
+supported_wprefs_locales="pt hr fr ko ja cs zh_TW.Big5 es zh_CN.GB2312"
 
 for lang in $LINGUAS; do
 	ok=0
diff --git a/po/Makefile.in b/po/Makefile.in
index a498c2a2..4fd3299d 100644
--- a/po/Makefile.in
+++ b/po/Makefile.in
@@ -94,7 +94,7 @@ CATALOGS = @MOFILES@
 
 CLEANFILES = $(CATALOGS) WindowMaker.pot
 
-EXTRA_DIST = cs.po de.po es.po fr.po gl.po ja.po ko.po nl.po pt.po se.po it.po 	no.po ru.po tr.po fi.po hr.po el.po pl.po ro.po dk.po zh_TW.Big5.po
+EXTRA_DIST = cs.po de.po es.po fr.po gl.po ja.po ko.po nl.po pt.po se.po it.po 	no.po ru.po tr.po fi.po hr.po el.po pl.po ro.po da.po zh_TW.Big5.po 	zh_CN.GB2312.po
 
 
 POTFILES =  	$(top_builddir)/src/appicon.c 	$(top_builddir)/src/defaults.c 	$(top_builddir)/src/dialog.c 	$(top_builddir)/src/dock.c 	$(top_builddir)/src/dockedapp.c 	$(top_builddir)/src/event.c 	$(top_builddir)/src/framewin.c 	$(top_builddir)/src/icon.c 	$(top_builddir)/src/main.c 	$(top_builddir)/src/menu.c 	$(top_builddir)/src/misc.c 	$(top_builddir)/src/pixmap.c 	$(top_builddir)/src/proplist.c 	$(top_builddir)/src/resources.c 	$(top_builddir)/src/rootmenu.c 	$(top_builddir)/src/screen.c 	$(top_builddir)/src/session.c 	$(top_builddir)/src/stacking.c 	$(top_builddir)/src/startup.c 	$(top_builddir)/src/switchmenu.c 	$(top_builddir)/src/texture.c 	$(top_builddir)/src/wdefaults.c 	$(top_builddir)/src/window.c 	$(top_builddir)/src/winmenu.c 	$(top_builddir)/src/winspector.c 	$(top_builddir)/src/workspace.c 	$(top_builddir)/src/xutil.c