diff --git a/ChangeLog b/ChangeLog
index 8c53ca0c1..6a759e233 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2006-10-19  Jim Meyering  <jim@meyering.net>
 
+	* bootstrap: Add names to each .gitignore file (if it exists)
+	as well as to .cvsignore.
+
 	* Makefile.maint (po-check): This rule didn't detect the new use
 	of "gettext" (as opposed to the use of "_" everywhere else) in
 	lib/xstrtol.h.  Adjust the grep regexp so that now it does.
diff --git a/bootstrap b/bootstrap
index 07f2460a9..a5065aaa4 100755
--- a/bootstrap
+++ b/bootstrap
@@ -389,11 +389,13 @@ slurp() {
       fi || exit
     done
 
-    ig=$dir/.cvsignore
-    if test -n "$copied" && test -f $ig; then
-      echo "$copied" | sort -u - $ig | cmp -s - $ig ||
-      echo "$copied" | sort -u - $ig -o $ig || exit
-    fi
+    for dot_ig in .cvsignore .gitignore; do
+      ig=$dir/$dot_ig
+      if test -n "$copied" && test -f $ig; then
+	echo "$copied" | sort -u - $ig | cmp -s - $ig ||
+	echo "$copied" | sort -u - $ig -o $ig || exit
+      fi
+    done
   done
 }