diff --git a/ChangeLog b/ChangeLog
index a60a9a0a..989db47f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2006-04-10  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	* Makefile.maint (cvs-sv): New macro, to be used..
+	(config.guess-url_prefix, config.sub-url_prefix)
+	(texinfo.tex-url_prefix, standards.texi-url_prefix): ..here;
+	point to CVS text checkout of Gnulib files.
+	(copyright-check): Bump current year.
+	(announcement): Do not hard-wire `./announce-gen'.
+	(cvs-update): Propagate failures of `cvs' and `move-if-change'
+	correctly.
+	* Makefile.cfg (executable-update): Use `chmod a+x' instead of
+	`chmod +x'.
+	(wget_files): Update config.guess, config.sub, texinfo.tex by
+	`wget-update', now that their URLs work again.
+
 2006-04-10  Paul Eggert  <eggert@cs.ucla.edu>
 
 	* doc/autoconf.texi (Particular Types): Don't use AC_CHECK_TYPE.
diff --git a/Makefile.cfg b/Makefile.cfg
index 33899f9d..b1d1530a 100644
--- a/Makefile.cfg
+++ b/Makefile.cfg
@@ -1,5 +1,5 @@
 # Customize Makefile.maint for Autoconf.            -*- Makefile -*-
-# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004, 2006 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -34,11 +34,10 @@ url_dir_list = \
 # Files to update automatically.
 wget_files = \
   $(srcdir)/doc/standards.texi \
-  $(srcdir)/doc/make-stds.texi
-#Currently done by hand:
-# $(srcdir)/config/config.guess
-# $(srcdir)/config/config.sub
-# $(srcdir)/config/texinfo.tex
+  $(srcdir)/doc/make-stds.texi \
+  $(srcdir)/config/config.guess \
+  $(srcdir)/config/config.sub \
+  $(srcdir)/config/texinfo.tex
 
 cvs_files = \
   $(srcdir)/config/elisp-comp \
@@ -53,7 +52,7 @@ local_updates = executable-update
 .PHONY: executable-update
 # autom4te-update is defined in Makefile.am.
 executable-update: wget-update cvs-update autom4te-update
-	chmod +x $(cvs_files)   \
+	chmod a+x $(cvs_files)   \
 	         $(srcdir)/config/config.guess \
 		 $(srcdir)/config/config.sub
 
diff --git a/Makefile.maint b/Makefile.maint
index fad3c81b..7e810fa0 100644
--- a/Makefile.maint
+++ b/Makefile.maint
@@ -382,7 +382,7 @@ v_etc_file = lib/version-etc.c
 # Make sure that the copyright date in $(v_etc_file) is up to date.
 copyright-check:
 	@if test -f $(v_etc_file); then \
-	  grep 'enum { COPYRIGHT_YEAR = 2005 };' $(v_etc_file) \
+	  grep "enum { COPYRIGHT_YEAR = `date +%Y` };" $(v_etc_file) \
 	    >/dev/null \
 	  || { echo 'out of date copyright in $(v_etc_file); update it' 1>&2; \
 	       exit 1; }; \
@@ -484,7 +484,7 @@ xd-delta = $(PACKAGE)-$(PREV_VERSION)-$(VERSION).xdelta
 
 rel-files = $(xd-delta) $(DIST_ARCHIVES)
 announcement: NEWS ChangeLog $(rel-files)
-	@./announce-gen							\
+	@$(announce_gen)						\
 	    --release-type=$(RELEASE_TYPE)				\
 	    --package=$(PACKAGE)					\
 	    --prev=$(PREV_VERSION)					\
@@ -500,6 +500,7 @@ announcement: NEWS ChangeLog $(rel-files)
 
 ftp-gnu = ftp://ftp.gnu.org/gnu
 www-gnu = http://www.gnu.org
+cvs-sv  = http://cvs.savannah.gnu.org/viewcvs/~checkout~
 
 # Use mv, if you don't have/want move-if-change.
 move_if_change ?= move-if-change
@@ -550,14 +551,14 @@ wget_files ?= \
 
 get-targets = $(patsubst %, get-%, $(wget_files))
 
-config.guess-url_prefix = $(ftp-gnu)/build-aux/
-config.sub-url_prefix = $(ftp-gnu)/build-aux/
+config.guess-url_prefix = $(cvs-sv)/config/config/
+config.sub-url_prefix = $(cvs-sv)/config/config/
 
 ansi2knr.c-url_prefix = ftp://ftp.cs.wisc.edu/ghost/
 
-texinfo.tex-url_prefix = $(ftp-gnu)/texinfo/
+texinfo.tex-url_prefix = $(cvs-sv)/gnulib/gnulib/build-aux/
 
-standards.texi-url_prefix = $(www-gnu)/prep/
+standards.texi-url_prefix = $(cvs-sv)/gnulib/gnulib/doc/
 make-stds.texi-url_prefix = $(standards.texi-url_prefix)
 
 target = $(patsubst get-%, %, $@)
@@ -580,18 +581,19 @@ wget-update: $(get-targets)
 
 .PHONY: cvs-update
 cvs-update:
-	fail=;								\
+	exit_status=0;							\
 	for f in $(cvs_files); do					\
 	  test -f $$f || { echo "*** skipping $$f" 1>&2; continue; };	\
 	  cvs diff $$f > /dev/null					\
-	    || { echo "*** $$f is locally modified; skipping it" 1>&2;	\
-		 fail=yes; continue; };					\
+	    || { exit_status=$$?;					\
+		 echo "*** $$f is locally modified; skipping it" 1>&2;	\
+		 continue; };						\
 	  file=$$(basename $$f);					\
 	  echo checking out $$file...;					\
 	  $(CVS) -d $(automake_repo) co -p automake/lib/$$file> $$f.t	\
-	    && $(move_if_change) $$f.t $$f;				\
+	    && $(move_if_change) $$f.t $$f || exit_status=$$?;		\
 	done;								\
-	test "$$fail" && exit 1
+	exit $$exit_status
 
 emit_upload_commands:
 	@echo =====================================