diff --git a/.gnulib b/.gnulib
index 5bf7fda437..478c2dcc83 160000
--- a/.gnulib
+++ b/.gnulib
@@ -1 +1 @@
-Subproject commit 5bf7fda437a10cc10cbd1be1bd06b374a581f0dd
+Subproject commit 478c2dcc839e5f4765e6417684ce414e2d4973a8
diff --git a/bootstrap b/bootstrap
index 522ac70a94..b286beb53f 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,