diff --git a/.gitignore b/.gitignore
index 04320a6..818afc1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,3 @@
-!/gnulib-tests/Makefile.am
-!/lib/Makefile.am
-!/lib/savedir.c
-!/lib/savedir.h
-!/m4/djgpp.m4
 *.a
 *.exe
 *.o
@@ -58,3 +53,8 @@ ChangeLog
 Makefile
 Makefile.in
 TAGS
+!/gnulib-tests/Makefile.am
+!/lib/Makefile.am
+!/lib/savedir.c
+!/lib/savedir.h
+!/m4/djgpp.m4
diff --git a/bootstrap b/bootstrap
index 522ac70..b286beb 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Print a version string.
-scriptversion=2011-05-16.16; # UTC
+scriptversion=2011-06-22.06; # UTC
 
 # Bootstrap this package from checked-out sources.
 
@@ -290,7 +290,7 @@ sort_patterns() {
     P
     x
     s/^\n//
-  }'
+  }' | sed '/^$/d'
 }
 
 # If $STR is not already on a line by itself in $FILE, insert it,