diff --git a/.gitignore b/.gitignore
index 708c510..fd7e7e8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -121,6 +121,7 @@
 /srclib/sys_stat.in.h
 /srclib/sys_types.in.h
 /srclib/time.in.h
+/srclib/unictype/bitmap.h
 /srclib/unistd.c
 /srclib/unistd.in.h
 /srclib/unitypes.in.h
@@ -136,6 +137,8 @@
 /srclib/xstrdup.c
 /srclib/uniwidth/cjk.h
 /srclib/uniwidth/width.c
+/srclib/uniwidth/width0.h
+/srclib/uniwidth/width2.h
 /srcm4/00gnulib.m4
 /srcm4/__inline.m4
 /srcm4/absolute-header.m4
@@ -226,6 +229,7 @@
 /srcm4/time_h.m4
 /srcm4/unistd_h.m4
 /srcm4/unlocked-io.m4
+/srcm4/vararrays.m4
 /srcm4/visibility.m4
 /srcm4/warn-on-use.m4
 /srcm4/wchar_h.m4
diff --git a/ChangeLog b/ChangeLog
index 2815c86..47d2d8a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2022-01-04  Bruno Haible  <bruno@clisp.org>
+
+	Update after gnulib changed.
+	* gnulib-local/m4/alloca.m4 (gl_FUNC_ALLOCA): Set GL_GENERATE_ALLOCA_H
+	instead of ALLOCA_H. Drop AC_SUBST and AM_CONDITIONAL invocations.
+
 2021-09-19  Bruno Haible  <bruno@clisp.org>
 
 	tests: Avoid check-subst failures in QEMU user-mode environments.
diff --git a/gnulib-local/m4/alloca.m4 b/gnulib-local/m4/alloca.m4
index 58a61f8..a0900ca 100644
--- a/gnulib-local/m4/alloca.m4
+++ b/gnulib-local/m4/alloca.m4
@@ -1,5 +1,5 @@
-# alloca.m4 serial 4 (gettext-0.18.2)
-dnl Copyright (C) 2002-2003, 2006, 2011 Free Software Foundation, Inc.
+# alloca.m4 serial 5
+dnl Copyright (C) 2002-2003, 2006, 2011, 2021-2022 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -22,10 +22,8 @@
   Need own alloca
 #endif
     ],
-    ALLOCA_H=alloca.h,
-    ALLOCA_H=)
-  AC_SUBST([ALLOCA_H])
-  AM_CONDITIONAL([GL_GENERATE_ALLOCA_H], [test -n "$ALLOCA_H"])
+    [GL_GENERATE_ALLOCA_H=true],
+    [GL_GENERATE_ALLOCA_H=false])
 ])
 
 # Prerequisites of lib/alloca.c.