diff --git a/ChangeLog b/ChangeLog
index f754089c..9312e67b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2010-04-03  James Youngman  <jay@gnu.org>
 
+	Add the update-copyright gnulib module.
+	* import-gnulib.config (maintainer_modules): Separate out the
+	modules primarily useful for maintainer activities.  Add
+	'update-copyright' to this.
+	* build-aux/.cvsignore: Ignore update-copyright, since it's
+	installed by gnulib.
+	* build-aux/.gitignore: Likewise.
+
 	Ignore generated files for the convenience of non-VPATH users.
 	* lib/.gitignore: Ignore object and archive files.
 	* find/.gitignore: Likewise.
diff --git a/build-aux/.cvsignore b/build-aux/.cvsignore
index 32080e33..f5e817be 100644
--- a/build-aux/.cvsignore
+++ b/build-aux/.cvsignore
@@ -17,3 +17,4 @@ warn-on-use.h
 c++defs.h
 useless-if-before-free
 vc-list-files
+update-copyright
diff --git a/build-aux/.gitignore b/build-aux/.gitignore
index 38ff6f30..7ced4ed4 100644
--- a/build-aux/.gitignore
+++ b/build-aux/.gitignore
@@ -16,3 +16,4 @@ compile
 /c++defs.h
 /useless-if-before-free
 /vc-list-files
+/update-copyright
diff --git a/import-gnulib.config b/import-gnulib.config
index 651334e7..119a3d58 100644
--- a/import-gnulib.config
+++ b/import-gnulib.config
@@ -18,6 +18,11 @@ build-aux/texinfo.tex
 
 gpl3_update_files=''
 
+# gnulib modules needed only for maintainer things.
+maintainer_modules='
+maintainer-makefile
+update-copyright
+'
 
 # Modules needed for findutils.
 # We need regex to ensure that we can build on platforms like
@@ -53,7 +58,6 @@ idcache
 inline
 inttypes
 lstat
-maintainer-makefile
 malloc
 math
 mbrtowc
@@ -98,7 +102,7 @@ xstrtod
 xstrtol
 xstrtoumax
 yesno
-'
+'"${maintainer_modules}"
 
 # Obsolete modules we've removed.
 # memcmp memset