diff --git a/.gnulib b/.gnulib
index c27f1a356f2f321daa7f971ef276a1dbfa873bf8..106a3866d01f9dd57ab4f10dbeb0d5a8db73a9f7 160000
--- a/.gnulib
+++ b/.gnulib
@@ -1 +1 @@
-Subproject commit c27f1a356f2f321daa7f971ef276a1dbfa873bf8
+Subproject commit 106a3866d01f9dd57ab4f10dbeb0d5a8db73a9f7
diff --git a/bootstrap b/bootstrap
index 2fdf267473bdae320c2c260df0e6f50127790929..e72894c15c9c98a2517b78f88c0ad5de5c75ed65 100755
--- a/bootstrap
+++ b/bootstrap
@@ -915,7 +915,8 @@ if test $use_libtool = 1; then
   esac
 fi
 echo "$0: $gnulib_tool $gnulib_tool_options --import ..."
-$gnulib_tool $gnulib_tool_options --import $gnulib_modules &&
+$gnulib_tool $gnulib_tool_options --import $gnulib_modules \
+  || die "gnulib-tool failed"
 
 for file in $gnulib_files; do
   symlink_to_dir "$GNULIB_SRCDIR" $file \