diff --git a/.gnulib b/.gnulib
index 7ba06c8ff3..833bff3a53 160000
--- a/.gnulib
+++ b/.gnulib
@@ -1 +1 @@
-Subproject commit 7ba06c8ff37d8725cb824c64b94be41b9294ffb7
+Subproject commit 833bff3a531e4730779f8c7be1d9f7c471e6f221
diff --git a/bootstrap b/bootstrap
index 242254922e..5ab4cf7ccb 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Print a version string.
-scriptversion=2010-05-17.18; # UTC
+scriptversion=2010-07-06.10; # UTC
 
 # Bootstrap this package from checked-out sources.
 
@@ -90,7 +90,8 @@ bootstrap_epilogue() { :; }
 # options because the latest/%s directory and the .po files within are
 # all symlinks.
 po_download_command_format=\
-"rsync -Lrtvz 'translationproject.org::tp/latest/%s/' '%s'"
+"rsync --delete --exclude '*.s1' -Lrtvz \
+ 'translationproject.org::tp/latest/%s/' '%s'"
 
 extract_package_name='
   /^AC_INIT(/{
@@ -475,15 +476,17 @@ download_po_files() {
   eval "$cmd"
 }
 
-# Download .po files to $po_dir/.reference and copy only the new
+# Mirror .po files to $po_dir/.reference and copy only the new
 # or modified ones into $po_dir.  Also update $po_dir/LINGUAS.
+# Note po files that exist locally only are left in $po_dir but will
+# not be included in LINGUAS and hence will not be distributed.
 update_po_files() {
   # Directory containing primary .po files.
   # Overwrite them only when we're sure a .po file is new.
   po_dir=$1
   domain=$2
 
-  # Download *.po files into this dir.
+  # Mirror *.po files into this dir.
   # Usually contains *.s1 checksum files.
   ref_po_dir="$po_dir/.reference"
 
diff --git a/bootstrap.conf b/bootstrap.conf
index 8a85b9146d..1f1d41658c 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -65,6 +65,7 @@ strsep
 strtok_r
 sys_stat
 sys_wait
+termios
 time_r
 timegm
 uname
@@ -132,6 +133,7 @@ gnulib_mk=Makefile.am
 gnulib_tool_option_extras="\
  --lgpl=2\
  --with-tests\
+ --libtool\
 "
 
 # Convince bootstrap to use multiple m4 directories.
diff --git a/src/util/util.c b/src/util/util.c
index b6b9712066..586baee461 100644
--- a/src/util/util.c
+++ b/src/util/util.c
@@ -43,9 +43,7 @@
 #endif
 #include <string.h>
 #include <signal.h>
-#if HAVE_TERMIOS_H
-# include <termios.h>
-#endif
+#include <termios.h>
 #include "c-ctype.h"
 
 #ifdef HAVE_PATHS_H