diff --git a/.gnulib b/.gnulib
index da8d59ee79138b85daee1ad5b22ea12e4fb6ce47..644c40496cf7d5a705a73c9dd32b035fcecc2ab1 160000
--- a/.gnulib
+++ b/.gnulib
@@ -1 +1 @@
-Subproject commit da8d59ee79138b85daee1ad5b22ea12e4fb6ce47
+Subproject commit 644c40496cf7d5a705a73c9dd32b035fcecc2ab1
diff --git a/bootstrap b/bootstrap
index 9c522049f01f48fffb62593917f9ce7b486e342f..a37fb8a03932660cc575bf128db246559ce2c735 100755
--- a/bootstrap
+++ b/bootstrap
@@ -256,12 +256,12 @@ esac
 # Extra files from gnulib, which override files from other sources.
 test -z "${gnulib_extra_files}" && \
   gnulib_extra_files="
-        $build_aux/install-sh
-        $build_aux/mdate-sh
-        $build_aux/texinfo.tex
-        $build_aux/depcomp
-        $build_aux/config.guess
-        $build_aux/config.sub
+        build-aux/install-sh
+        build-aux/mdate-sh
+        build-aux/texinfo.tex
+        build-aux/depcomp
+        build-aux/config.guess
+        build-aux/config.sub
         doc/INSTALL
 "
 
diff --git a/bootstrap.conf b/bootstrap.conf
index 410e4f5dc46324219a836443a8a80f453ac4d000..36e8e482575579b83edb9abcfd32bef7f0eb2bb5 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -232,10 +232,10 @@ touch AUTHORS ChangeLog || exit 1
 
 # Override bootstrap's list - we don't use mdate-sh or texinfo.tex.
 gnulib_extra_files="
-        $build_aux/install-sh
-        $build_aux/depcomp
-        $build_aux/config.guess
-        $build_aux/config.sub
+        build-aux/install-sh
+        build-aux/depcomp
+        build-aux/config.guess
+        build-aux/config.sub
         doc/INSTALL
 "