diff --git a/.cvsignore b/.cvsignore
index 87c055ed..0567126e 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -19,3 +19,5 @@ link-warning.h
 gnulib-git
 tests
 findutils-*
+GNUmakefile
+maint.mk
diff --git a/.gitignore b/.gitignore
index 9e39e590..355bc98b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,3 +22,5 @@ tests
 *~
 patches
 INSTALL
+/GNUmakefile
+/maint.mk
diff --git a/ChangeLog b/ChangeLog
index 64692a12..1ec8f78f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-04-02  James Youngman  <jay@gnu.org>
+
+	* import-gnulib.config (modules): Add maintainer-makefile.
+
 2010-04-02  James Youngman  <jay@gnu.org>
 
 	* NEWS: Update copyright years.
diff --git a/build-aux/.cvsignore b/build-aux/.cvsignore
index 425e4b66..32080e33 100644
--- a/build-aux/.cvsignore
+++ b/build-aux/.cvsignore
@@ -15,3 +15,5 @@ ylwrap
 arg-nonnull.h
 warn-on-use.h
 c++defs.h
+useless-if-before-free
+vc-list-files
diff --git a/build-aux/.gitignore b/build-aux/.gitignore
index c7cf5bea..38ff6f30 100644
--- a/build-aux/.gitignore
+++ b/build-aux/.gitignore
@@ -14,3 +14,5 @@ compile
 /arg-nonnull.h
 /warn-on-use.h
 /c++defs.h
+/useless-if-before-free
+/vc-list-files
diff --git a/import-gnulib.config b/import-gnulib.config
index b8288f1c..ae77c71f 100644
--- a/import-gnulib.config
+++ b/import-gnulib.config
@@ -52,6 +52,7 @@ idcache
 inline
 inttypes
 lstat
+maintainer-makefile
 malloc
 math
 mbrtowc