2 files changed, 6 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index c45bfad8..a5df756d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2008-08-02  Joel E. Denny  <jdenny@ces.clemson.edu>
 
+	Update for recent .gitignore fix in Gnulib.
+	* bootstrap: Back out 2008-07-18 hack now that gnulib-tool creates
+	anchored .gitignore entries.
+
+2008-08-02  Joel E. Denny  <jdenny@ces.clemson.edu>
+
 	Set gnu or gnits strictness.
 	* configure.ac (AM_INIT_AUTOMAKE): Set gnu strictness during
 	development and gnits strictness for releases.  Based on Eric Blake's
diff --git a/bootstrap b/bootstrap
index c3c7748b..f92d1ccd 100755
--- a/bootstrap
+++ b/bootstrap
@@ -614,12 +614,6 @@ if test -f $mam_template; then
   done
 fi
 
-# FIXME: Gnulib should be patched to add "/" in front of .gitignore entries
-# instead.  Anyway, this hack must be done before invoking autoconf so that
-# build-aux/git-version-gen doesn't think the version is dirty because
-# .gitignore isn't committed.
-grep -v '^GNUmakefile$' .gitignore > .gitignore~ && mv .gitignore~ .gitignore
-
 # Reconfigure, getting other files.
 
 for command in \