diff --git a/locale/Makefile b/locale/Makefile
index 75deb8923e..48c0a4792b 100644
--- a/locale/Makefile
+++ b/locale/Makefile
@@ -3,6 +3,8 @@
 
 # this makefile may be invoked to build either wxstd.po or any lang.mo
 
+WX_LANGUAGES = cs.po de.po dk.po fi.po fr.po
+
 # the programs we use (TODO: use configure to detect them)
 MSGFMT=msgfmt
 MSGMERGE=msgmerge
@@ -10,7 +12,7 @@ XGETTEXT=xgettext
 XARGS=xargs
 
 # common xgettext args: C++ syntax, use the specified macro names as markers
-XGETTEXT_ARGS=-C -k_ -kwxTRANSLATE -s
+XGETTEXT_ARGS=-C -k_ -kwxTRANSLATE -s -j
 
 # implicit rules
 %.mo: %.po
@@ -21,10 +23,18 @@ XGETTEXT_ARGS=-C -k_ -kwxTRANSLATE -s
 	if [ -f $@ ]; then $(MSGMERGE) $@ wxstd.po > $@.new && mv $@.new $@; else cp wxstd.po $@; fi
 
 wxstd.po:
+	touch $@
 	find ../include -name "*.h" | $(XARGS) $(XGETTEXT) $(XGETTEXT_ARGS) -o wxstd.po
 	find ../src -name "*.cpp" | $(XARGS) $(XGETTEXT) $(XGETTEXT_ARGS) -o wxstd.po
 
+allpo: update $(WX_LANGUAGES)
+
+update:
+	$(RM) wxstd.po
+
 # targets depending on this one will be always remade
 FORCE:
 
+.PHONY: allpo update
+
 # $Id$