diff --git a/.gitignore b/.gitignore
index 2139d176da..949bd3bc5a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,9 +14,12 @@
 /INSTALL
 /aclocal.m4
 /autom4te.cache
-/build-aux/.gitignore
 /build-aux/compile
+/build-aux/config.guess
+/build-aux/config.sub
 /build-aux/depcomp
+/build-aux/install-sh
+/build-aux/ltmain.sh
 /build-aux/missing
 /build-aux/test-driver
 /config.h.in
diff --git a/bootstrap.conf b/bootstrap.conf
index 13dd239fd1..5ff3374ded 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -81,6 +81,8 @@ copy=true
 
 bootstrap_sync=true
 
+vc_ignore=
+
 
 # Tell gnulib to:
 #   require LGPLv2+
@@ -95,6 +97,7 @@ gnulib_tool_option_extras="\
  --lgpl=2\
  --makefile-name=gnulib.mk\
  --avoid=pt_chown\
+ --no-vc-files\
 "
 local_gl_dir=gnulib/local