diff --git a/bootstrap b/bootstrap
index c17a36f1..73365985 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Print a version string.
-scriptversion=2021-01-10.00; # UTC
+scriptversion=2021-04-11.09; # UTC
 
 # Bootstrap this package from checked-out sources.
 
@@ -115,6 +115,12 @@ Running without arguments will suffice in most cases.
 EOF
 }
 
+copyright_year=`echo "$scriptversion" | sed -e 's/[^0-9].*//'`
+copyright="Copyright (C) ${copyright_year} Free Software Foundation, Inc.
+License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl.html>.
+This is free software: you are free to change and redistribute it.
+There is NO WARRANTY, to the extent permitted by law."
+
 # warnf_ FORMAT-STRING ARG1...
 warnf_ ()
 {
@@ -337,6 +343,12 @@ do
   --help)
     usage
     exit;;
+  --version)
+    set -e
+    echo "bootstrap $scriptversion"
+    echo "$copyright"
+    exit 0
+    ;;
   --gnulib-srcdir=*)
     GNULIB_SRCDIR=${option#--gnulib-srcdir=};;
   --skip-po)
diff --git a/gnulib b/gnulib
index e639e557..7e3a9c5b 160000
--- a/gnulib
+++ b/gnulib
@@ -1 +1 @@
-Subproject commit e639e557f1b09a4f5589377705a30c4014b76924
+Subproject commit 7e3a9c5bde817dab5b9a6987a373e6a3c2e6576b
diff --git a/lib/.gitignore b/lib/.gitignore
index 00843d68..63b3fbc9 100644
--- a/lib/.gitignore
+++ b/lib/.gitignore
@@ -190,6 +190,8 @@
 /hash-triple.h
 /hash.c
 /hash.h
+/ialloc.c
+/ialloc.h
 /iconv.c
 /iconv.h
 /iconv.in.h
@@ -304,6 +306,7 @@
 /readline.h
 /readlink.c
 /realloc.c
+/reallocarray.c
 /ref-add.sed
 /ref-del.sed
 /relocatable.c
diff --git a/m4/.gitignore b/m4/.gitignore
index dc8e1478..4f0cd4ed 100644
--- a/m4/.gitignore
+++ b/m4/.gitignore
@@ -174,6 +174,7 @@
 /readline.m4
 /readlink.m4
 /realloc.m4
+/reallocarray.m4
 /relocatable-lib.m4
 /relocatable.m4
 /rename.m4