diff --git a/ChangeLog b/ChangeLog
index 6fc7aef3..026de24d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-03-17  Paul D. Smith  <psmith@gnu.org>
+
+	* maintMakefile (do-po-update): Rewrite this rule to clean up and
+	allow multiple concurrent runs.
+	Patch from Joseph Myers <joseph@codesourcery.com>
+
 2006-03-17  Boris Kolpackov  <boris@kolpackov.net>
 
 	* dep.h (struct dep): Add the stem field.
diff --git a/README.cvs b/README.cvs
index 7ce2cec5..97e92596 100644
--- a/README.cvs
+++ b/README.cvs
@@ -49,7 +49,7 @@ After checking out the code, you will need to perform these steps to get
 to the point where you can run "make".
 
 
- 1) $ autoreconf -i -s
+ 1) $ autoreconf -i
 
     This rebuilds all the things that need rebuilding, installing
     missing files as symbolic links.
@@ -133,10 +133,12 @@ prerequisites are available of course).
 This list is eminently suitable for a quick swipe o' the mouse and a
 swift click o' mouse-2 into an xterm.  Go for it!
 
-
-autoreconf -i -s
+autoreconf -i
 ./configure
 make update
 make
 make check
-make distcheck
+
+Or, all-in-one:
+
+autoreconf -i && ./configure && make update && make && make check
diff --git a/maintMakefile b/maintMakefile
index 60d1367c..2bafbc21 100644
--- a/maintMakefile
+++ b/maintMakefile
@@ -134,11 +134,12 @@ move_if_change =  if test -r $(target) && cmp -s $(target).t $(target); then \
 po_repo = http://www.iro.umontreal.ca/translation/maint/$(PACKAGE)
 .PHONY: do-po-update po-update
 do-po-update:
-	tmppo=/tmp/$(PACKAGE)-$(VERSION)-po &&\
-	rm -rf $$tmppo && \
-	mkdir $$tmppo && \
-	(cd $$tmppo && $(WGET) -r -l1 -nd --no-parent -A '*.po' $(po_repo)) &&\
-	cp $$tmppo/*.po po
+	tmppo="/tmp/po-$(PACKAGE)-$(VERSION).$$$$" \
+	  && rm -rf "$$tmppo" \
+	  && mkdir "$$tmppo" \
+	  && (cd "$$tmppo" \
+		&& $(WGET) -r -l1 -nd --no-parent -A '*.po' $(po_repo)) \
+	  && cp "$$tmppo"/*.po po && rm -rf "$$tmppo"
 	cd po && $(MAKE) update-po
 	$(MAKE) po-check