diff --git a/bootstrap b/bootstrap
index fa9d7c94..5264d9f1 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Print a version string.
-scriptversion=2018-07-25.07; # UTC
+scriptversion=2018-10-13.05; # UTC
 
 # Bootstrap this package from checked-out sources.
 
@@ -162,18 +162,11 @@ bootstrap_post_import_hook() { :; }
 # Override it via your own definition in bootstrap.conf.
 bootstrap_epilogue() { :; }
 
-# The command to download all .po files for a specified domain into
-# a specified directory.  Fill in the first %s is the domain name, and
-# the second with the destination directory.  Use rsync's -L and -r
-# options because the latest/%s directory and the .po files within are
-# all symlinks.
+# The command to download all .po files for a specified domain into a
+# specified directory.  Fill in the first %s with the destination
+# directory and the second with the domain name.
 po_download_command_format=\
-"rsync --include '*.po' --exclude '*' -Lrtvz \
- 'translationproject.org::tp/latest/%s/' '%s'"
-
-# Fallback for downloading .po files (if rsync fails).
-po_download_command_format2=\
-"wget --mirror -nd -q -np -A.po -P '%s' \
+"wget --mirror --level=1 -nd -q -A.po -P '%s' \
  https://translationproject.org/latest/%s/"
 
 # Prefer a non-empty tarname (4th argument of AC_INIT if given), else
@@ -741,10 +734,7 @@ download_po_files() {
   subdir=$1
   domain=$2
   echo "$me: getting translations into $subdir for $domain..."
-  cmd=$(printf "$po_download_command_format" "$domain" "$subdir")
-  eval "$cmd" && return
-  # Fallback to HTTPS.
-  cmd=$(printf "$po_download_command_format2" "$subdir" "$domain")
+  cmd=$(printf "$po_download_command_format" "$subdir" "$domain")
   eval "$cmd"
 }
 
diff --git a/configure.ac b/configure.ac
index 23a16a81..7cd0964d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -219,7 +219,6 @@ gl_INIT
 # Checks for library functions.
 AC_CHECK_FUNCS_ONCE([setlocale])
 AM_WITH_DMALLOC
-gl_TIMEVAR
 
 # Gettext.
 # We use gnulib, which is only guaranteed to work properly with the
diff --git a/gnulib b/gnulib
index 3ea3c45d..b159aa5d 160000
--- a/gnulib
+++ b/gnulib
@@ -1 +1 @@
-Subproject commit 3ea3c45d037aef4d0ab740447c47ad3c69507194
+Subproject commit b159aa5da7e1aa7abeb2f77ba644aa164d25a46d
diff --git a/lib/.gitignore b/lib/.gitignore
index 08e32e14..cee8729c 100644
--- a/lib/.gitignore
+++ b/lib/.gitignore
@@ -277,4 +277,15 @@
 /timevar.h
 /sys_time.in.h
 /sys_times.in.h
-/times.c
+/gethrxtime.c
+/gethrxtime.h
+/getrusage.c
+/gettime.c
+/gettimeofday.c
+/localtime-buffer.c
+/localtime-buffer.h
+/sys_resource.in.h
+/timespec.c
+/timespec.h
+/xtime.c
+/xtime.h
diff --git a/m4/.gitignore b/m4/.gitignore
index f50f0c48..d6af9d8c 100644
--- a/m4/.gitignore
+++ b/m4/.gitignore
@@ -179,8 +179,14 @@
 /xstrndup.m4
 /host-cpu-c-abi.m4
 /stat-time.m4
-/timevar.m4
 /sys_time_h.m4
 /sys_times_h.m4
-/times.m4
 /sh-filename.m4
+/clock_time.m4
+/gethrxtime.m4
+/getrusage.m4
+/gettime.m4
+/gettimeofday.m4
+/localtime-buffer.m4
+/sys_resource_h.m4
+/timespec.m4