diff --git a/AUTHORS b/AUTHORS
index 96f2e834b..73695ba82 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -24,7 +24,8 @@ and nasty bugs.
 
 -----
 
-Copyright (C) 1998-2015, 2018-2022 Free Software Foundation, Inc.
+Copyright (C) 1998-2015, 2018-2022, 2025-2026 Free Software Foundation,
+Inc.
 
 This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/ChangeLog-2012 b/ChangeLog-2012
index fc1b67ec7..8af7a3dcd 100644
--- a/ChangeLog-2012
+++ b/ChangeLog-2012
@@ -26732,8 +26732,8 @@
 
 	-----
 
-	Copyright (C) 1987-1988, 1991-2015, 2018-2022 Free Software
-	Foundation, Inc.
+	Copyright (C) 1987-1988, 1991-2015, 2018-2022, 2025-2026 Free
+	Software Foundation, Inc.
 
 	Copying and distribution of this file, with or without
 	modification, are permitted provided the copyright notice and this
diff --git a/Makefile.am b/Makefile.am
index fc774aaa2..87c91b946 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,7 @@
 ## Process this file with automake to produce Makefile.in.
 
-# Copyright (C) 2001-2015, 2018-2022 Free Software Foundation, Inc.
+# Copyright (C) 2001-2015, 2018-2022, 2025-2026 Free Software
+# Foundation, Inc.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/NEWS b/NEWS
index 9784581ab..4dacab7e8 100644
--- a/NEWS
+++ b/NEWS
@@ -4748,7 +4748,8 @@ mode: outline
 fill-column: 76
 End:
 
-Copyright (C) 1995-2015, 2018-2022 Free Software Foundation, Inc.
+Copyright (C) 1995-2015, 2018-2022, 2025-2026 Free Software Foundation,
+Inc.
 
 This file is part of Bison, the GNU Parser Generator.
 
diff --git a/PACKAGING b/PACKAGING
index 7c20caf23..70b190a94 100644
--- a/PACKAGING
+++ b/PACKAGING
@@ -36,8 +36,8 @@ to the bison package.
 
 -----
 
-Copyright (C) 2002, 2005, 2009-2015, 2018-2022 Free Software Foundation,
-Inc.
+Copyright (C) 2002, 2005, 2009-2015, 2018-2022, 2025-2026 Free Software
+Foundation, Inc.
 
 This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/README b/README
index 7a73bc68f..670843aca 100644
--- a/README
+++ b/README
@@ -120,8 +120,8 @@ fill-column: 76
 ispell-dictionary: "american"
 End:
 
-Copyright (C) 1992, 1998-1999, 2003-2005, 2008-2015, 2018-2022 Free
-Software Foundation, Inc.
+Copyright (C) 1992, 1998-1999, 2003-2005, 2008-2015, 2018-2022,
+2025-2026 Free Software Foundation, Inc.
 
 This file is part of GNU bison, the GNU Compiler Compiler.
 
diff --git a/README-alpha b/README-alpha
index f8b3f614a..81dfc46ac 100644
--- a/README-alpha
+++ b/README-alpha
@@ -12,8 +12,8 @@ the problems you encounter.
 
 -----
 
-Copyright (C) 2002, 2004, 2009-2015, 2018-2022 Free Software Foundation,
-Inc.
+Copyright (C) 2002, 2004, 2009-2015, 2018-2022, 2025-2026 Free Software
+Foundation, Inc.
 
 This file is part of GNU Bison.
 
diff --git a/README-hacking.md b/README-hacking.md
index b5647fff3..f8cfd5da0 100644
--- a/README-hacking.md
+++ b/README-hacking.md
@@ -638,8 +638,8 @@ bootstrapped.
 
 <!--
 
-Copyright (C) 2002-2005, 2007-2015, 2018-2022 Free Software Foundation,
-Inc.
+Copyright (C) 2002-2005, 2007-2015, 2018-2022, 2025-2026 Free Software
+Foundation, Inc.
 
 This file is part of GNU Bison.
 
diff --git a/THANKS b/THANKS
index d9159fa55..a016b2874 100644
--- a/THANKS
+++ b/THANKS
@@ -242,7 +242,8 @@ End:
 
 -----
 
-Copyright (C) 2000-2015, 2018-2022 Free Software Foundation, Inc.
+Copyright (C) 2000-2015, 2018-2022, 2025-2026 Free Software Foundation,
+Inc.
 
 This file is part of Bison, the GNU Parser Generator.
 
diff --git a/TODO b/TODO
index 781a42407..ff015f6f0 100644
--- a/TODO
+++ b/TODO
@@ -714,8 +714,8 @@ fill-column: 76
 ispell-dictionary: "american"
 End:
 
-Copyright (C) 2001-2004, 2006, 2008-2015, 2018-2022 Free Software
-Foundation, Inc.
+Copyright (C) 2001-2004, 2006, 2008-2015, 2018-2022, 2025-2026 Free
+Software Foundation, Inc.
 
 This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/autogen.sh b/autogen.sh
index 02028f272..1401374d7 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -4,7 +4,7 @@
 # also regenerates all aclocal.m4, config.h.in, Makefile.in, configure files
 # with new versions of autoconf or automake.
 
-# Copyright (C) 2003-2022 Free Software Foundation, Inc.
+# Copyright (C) 2003-2026 Free Software Foundation, Inc.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -30,457 +30,10 @@
 # Alternatively, you can use an autogen.sh script that is specific
 # to your package.
 
-scriptversion=2022-07-24.15; # UTC
-
 me="$0"
 medir=`dirname "$me"`
 
 # Read the function library and the configuration.
 . "$medir"/bootstrap-funclib.sh
 
-# Ensure that CDPATH is not set.  Otherwise, the output from cd
-# would cause trouble in at least one use below.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-# Environment variables that may be set by the user.
-: "${AUTOPOINT=autopoint}"
-: "${AUTORECONF=autoreconf}"
-
-if test "$vc_ignore" = auto; then
-  vc_ignore=
-  test -d .git && vc_ignore=.gitignore
-  test -d CVS && vc_ignore="$vc_ignore .cvsignore"
-fi
-
-usage() {
-  cat <<EOF
-Usage: $me [OPTION]...
-Bootstrap this package from the checked-out sources.
-
-Optional environment variables:
-  GNULIB_SRCDIR            Specifies the local directory where gnulib
-                           sources reside.  Use this if you already
-                           have gnulib sources on your machine, and
-                           you want to use these sources.
-
-Options:
-  --copy                   copy files instead of creating symbolic links
-  --force                  attempt to bootstrap even if the sources seem
-                           not to have been checked out
-EOF
-  bootstrap_print_option_usage_hook
-  cat <<EOF
-If the file bootstrap.conf exists in the same directory as this script, its
-contents are read as shell variables to configure the bootstrap.
-
-For build prerequisites, environment variables like \$AUTOCONF and \$AMTAR
-are honored.
-
-Gnulib sources are assumed to be present:
-  * in \$GNULIB_SRCDIR, if that environment variable is set,
-  * otherwise, in the 'gnulib' submodule, if such a submodule is configured,
-  * otherwise, in the 'gnulib' subdirectory.
-
-Running without arguments will suffice in most cases.
-EOF
-}
-
-# Parse options.
-
-# Whether to use copies instead of symlinks.
-copy=false
-
-for option
-do
-  case $option in
-  --help)
-    usage
-    exit;;
-  --version)
-    set -e
-    echo "autogen.sh $scriptversion"
-    echo "$copyright"
-    exit 0
-    ;;
-  --force)
-    checkout_only_file=;;
-  --copy)
-    copy=true;;
-  *)
-    bootstrap_option_hook $option || die "$option: unknown option";;
-  esac
-done
-
-test -z "$GNULIB_SRCDIR" || test -d "$GNULIB_SRCDIR" \
-  || die "Error: \$GNULIB_SRCDIR environment variable or --gnulib-srcdir option is specified, but does not denote a directory"
-
-if test -n "$checkout_only_file" && test ! -r "$checkout_only_file"; then
-  die "Running this script from a non-checked-out distribution is risky."
-fi
-
-if $use_gnulib; then
-  if test -z "$GNULIB_SRCDIR"; then
-    gnulib_path=$(test -f .gitmodules && git config --file .gitmodules submodule.gnulib.path)
-    test -z "$gnulib_path" && gnulib_path=gnulib
-    GNULIB_SRCDIR=$gnulib_path
-  fi
-fi
-
-version_controlled_file() {
-  parent=$1
-  file=$2
-  if test -d .git; then
-    git rm -n "$file" > /dev/null 2>&1
-  elif test -d .svn; then
-    svn log -r HEAD "$file" > /dev/null 2>&1
-  elif test -d CVS; then
-    grep -F "/${file##*/}/" "$parent/CVS/Entries" 2>/dev/null |
-             grep '^/[^/]*/[0-9]' > /dev/null
-  else
-    warn_ "no version control for $file?"
-    false
-  fi
-}
-
-# Strip blank and comment lines to leave significant entries.
-gitignore_entries() {
-  sed '/^#/d; /^$/d' "$@"
-}
-
-# If $STR is not already on a line by itself in $FILE, insert it at the start.
-# Entries are inserted at the start of the ignore list to ensure existing
-# entries starting with ! are not overridden.  Such entries support
-# whitelisting exceptions after a more generic blacklist pattern.
-insert_if_absent() {
-  file=$1
-  str=$2
-  test -f $file || touch $file
-  test -r $file || die "Error: failed to read ignore file: $file"
-  duplicate_entries=$(gitignore_entries $file | sort | uniq -d)
-  if [ "$duplicate_entries" ] ; then
-    die "Error: Duplicate entries in $file: " $duplicate_entries
-  fi
-  linesold=$(gitignore_entries $file | wc -l)
-  linesnew=$( { echo "$str"; cat $file; } | gitignore_entries | sort -u | wc -l)
-  if [ $linesold != $linesnew ] ; then
-    { echo "$str" | cat - $file > $file.bak && mv $file.bak $file; } \
-      || die "insert_if_absent $file $str: failed"
-  fi
-}
-
-# Adjust $PATTERN for $VC_IGNORE_FILE and insert it with
-# insert_if_absent.
-insert_vc_ignore() {
-  vc_ignore_file="$1"
-  pattern="$2"
-  case $vc_ignore_file in
-  *.gitignore)
-    # A .gitignore entry that does not start with '/' applies
-    # recursively to subdirectories, so prepend '/' to every
-    # .gitignore entry.
-    pattern=$(echo "$pattern" | sed s,^,/,);;
-  esac
-  insert_if_absent "$vc_ignore_file" "$pattern"
-}
-
-symlink_to_dir()
-{
-  src=$1/$2
-  dst=${3-$2}
-
-  test -f "$src" && {
-
-    # If the destination directory doesn't exist, create it.
-    # This is required at least for "lib/uniwidth/cjk.h".
-    dst_dir=$(dirname "$dst")
-    if ! test -d "$dst_dir"; then
-      mkdir -p "$dst_dir"
-
-      # If we've just created a directory like lib/uniwidth,
-      # tell version control system(s) it's ignorable.
-      # FIXME: for now, this does only one level
-      parent=$(dirname "$dst_dir")
-      for dot_ig in x $vc_ignore; do
-        test $dot_ig = x && continue
-        ig=$parent/$dot_ig
-        insert_vc_ignore $ig "${dst_dir##*/}"
-      done
-    fi
-
-    if $copy; then
-      {
-        test ! -h "$dst" || {
-          echo "$me: rm -f $dst" &&
-          rm -f "$dst"
-        }
-      } &&
-      test -f "$dst" &&
-      cmp -s "$src" "$dst" || {
-        echo "$me: cp -fp $src $dst" &&
-        cp -fp "$src" "$dst"
-      }
-    else
-      # Leave any existing symlink alone, if it already points to the source,
-      # so that broken build tools that care about symlink times
-      # aren't confused into doing unnecessary builds.  Conversely, if the
-      # existing symlink's timestamp is older than the source, make it afresh,
-      # so that broken tools aren't confused into skipping needed builds.  See
-      # <https://lists.gnu.org/r/bug-gnulib/2011-05/msg00326.html>.
-      test -h "$dst" &&
-      src_ls=$(ls -diL "$src" 2>/dev/null) && set $src_ls && src_i=$1 &&
-      dst_ls=$(ls -diL "$dst" 2>/dev/null) && set $dst_ls && dst_i=$1 &&
-      test "$src_i" = "$dst_i" &&
-      both_ls=$(ls -dt "$src" "$dst") &&
-      test "X$both_ls" = "X$dst$nl$src" || {
-        dot_dots=
-        case $src in
-        /*) ;;
-        *)
-          case /$dst/ in
-          *//* | */../* | */./* | /*/*/*/*/*/)
-             die "invalid symlink calculation: $src -> $dst";;
-          /*/*/*/*/)    dot_dots=../../../;;
-          /*/*/*/)      dot_dots=../../;;
-          /*/*/)        dot_dots=../;;
-          esac;;
-        esac
-
-        echo "$me: ln -fs $dot_dots$src $dst" &&
-        ln -fs "$dot_dots$src" "$dst"
-      }
-    fi
-  }
-}
-
-# Die if there is no AC_CONFIG_AUX_DIR($build_aux) line in configure.ac.
-found_aux_dir=no
-grep '^[	 ]*AC_CONFIG_AUX_DIR(\['"$build_aux"'])' configure.ac \
-    >/dev/null && found_aux_dir=yes
-grep '^[	 ]*AC_CONFIG_AUX_DIR('"$build_aux"')' configure.ac \
-    >/dev/null && found_aux_dir=yes
-test $found_aux_dir = yes \
-  || die "configure.ac lacks 'AC_CONFIG_AUX_DIR([$build_aux])'; add it"
-
-# If $build_aux doesn't exist, create it now, otherwise some bits
-# below will malfunction.  If creating it, also mark it as ignored.
-if test ! -d $build_aux; then
-  mkdir $build_aux
-  for dot_ig in x $vc_ignore; do
-    test $dot_ig = x && continue
-    insert_vc_ignore $dot_ig $build_aux
-  done
-fi
-
-check_build_prerequisites false
-
-use_libtool=0
-# We'd like to use grep -E, to see if any of LT_INIT,
-# AC_PROG_LIBTOOL, AM_PROG_LIBTOOL is used in configure.ac,
-# but that's not portable enough (e.g., for Solaris).
-grep '^[	 ]*A[CM]_PROG_LIBTOOL' configure.ac >/dev/null \
-  && use_libtool=1
-grep '^[	 ]*LT_INIT' configure.ac >/dev/null \
-  && use_libtool=1
-if test $use_libtool = 1; then
-  find_tool LIBTOOLIZE glibtoolize libtoolize
-fi
-
-if $use_gnulib; then
-  gnulib_tool=$GNULIB_SRCDIR/gnulib-tool
-  <$gnulib_tool || exit $?
-fi
-
-# NOTE: we have to be careful to run both autopoint and libtoolize
-# before gnulib-tool, since gnulib-tool is likely to provide newer
-# versions of files "installed" by these two programs.
-# Then, *after* gnulib-tool (see below), we have to be careful to
-# run autoreconf in such a way that it does not run either of these
-# two just-pre-run programs.
-
-# Import from gettext.
-with_gettext=yes
-grep '^[	 ]*AM_GNU_GETTEXT_VERSION(' configure.ac >/dev/null || \
-    with_gettext=no
-
-if test $with_gettext = yes || test $use_libtool = 1; then
-
-  tempbase=.bootstrap$$
-  trap "rm -f $tempbase.0 $tempbase.1" 1 2 13 15
-
-  > $tempbase.0 > $tempbase.1 &&
-  find . ! -type d -print | sort > $tempbase.0 || exit
-
-  if test $with_gettext = yes; then
-    # Released autopoint has the tendency to install macros that have been
-    # obsoleted in current gnulib, so run this before gnulib-tool.
-    echo "$0: $AUTOPOINT --force"
-    $AUTOPOINT --force || exit
-  fi
-
-  # Autoreconf runs aclocal before libtoolize, which causes spurious
-  # warnings if the initial aclocal is confused by the libtoolized
-  # (or worse out-of-date) macro directory.
-  # libtoolize 1.9b added the --install option; but we support back
-  # to libtoolize 1.5.22, where the install action was default.
-  if test $use_libtool = 1; then
-    install=
-    case $($LIBTOOLIZE --help) in
-      *--install*) install=--install ;;
-    esac
-    echo "running: $LIBTOOLIZE $install --copy"
-    $LIBTOOLIZE $install --copy
-  fi
-
-  find . ! -type d -print | sort >$tempbase.1
-  old_IFS=$IFS
-  IFS=$nl
-  for file in $(comm -13 $tempbase.0 $tempbase.1); do
-    IFS=$old_IFS
-    parent=${file%/*}
-    version_controlled_file "$parent" "$file" || {
-      for dot_ig in x $vc_ignore; do
-        test $dot_ig = x && continue
-        ig=$parent/$dot_ig
-        insert_vc_ignore "$ig" "${file##*/}"
-      done
-    }
-  done
-  IFS=$old_IFS
-
-  rm -f $tempbase.0 $tempbase.1
-  trap - 1 2 13 15
-fi
-
-# Import from gnulib.
-
-if $use_gnulib; then
-  gnulib_tool_options="\
-   --no-changelog\
-   --aux-dir=$build_aux\
-   --doc-base=$doc_base\
-   --lib=$gnulib_name\
-   --m4-base=$m4_base/\
-   --source-base=$source_base/\
-   --tests-base=$tests_base\
-   --local-dir=$local_gl_dir\
-   $gnulib_tool_option_extras\
-  "
-  if test $use_libtool = 1; then
-    case "$gnulib_tool_options " in
-      *' --libtool '*) ;;
-      *) gnulib_tool_options="$gnulib_tool_options --libtool" ;;
-    esac
-  fi
-  echo "$0: $gnulib_tool $gnulib_tool_options --import ..."
-  $gnulib_tool $gnulib_tool_options --import $gnulib_modules \
-    || die "gnulib-tool failed"
-
-  for file in $gnulib_files; do
-    symlink_to_dir "$GNULIB_SRCDIR" $file \
-      || die "failed to symlink $file"
-  done
-fi
-
-bootstrap_post_import_hook \
-  || die "bootstrap_post_import_hook failed"
-
-# Remove any dangling symlink matching "*.m4" or "*.[ch]" in some
-# gnulib-populated directories.  Such .m4 files would cause aclocal to fail.
-# The following requires GNU find 4.2.3 or newer.  Considering the usual
-# portability constraints of this script, that may seem a very demanding
-# requirement, but it should be ok.  Ignore any failure, which is fine,
-# since this is only a convenience to help developers avoid the relatively
-# unusual case in which a symlinked-to .m4 file is git-removed from gnulib
-# between successive runs of this script.
-find "$m4_base" "$source_base" \
-  -depth \( -name '*.m4' -o -name '*.[ch]' \) \
-  -type l -xtype l -delete > /dev/null 2>&1
-
-# Invoke autoreconf with --force --install to ensure upgrades of tools
-# such as ylwrap.
-AUTORECONFFLAGS="--verbose --install --force -I $m4_base $ACLOCAL_FLAGS"
-
-# Some systems (RHEL 5) are using ancient autotools, for which the
-# --no-recursive option had not been invented.  Detect that lack and
-# omit the option when it's not supported.  FIXME in 2017: remove this
-# hack when RHEL 5 autotools are updated, or when they become irrelevant.
-case $($AUTORECONF --help) in
-  *--no-recursive*) AUTORECONFFLAGS="$AUTORECONFFLAGS --no-recursive";;
-esac
-
-# Tell autoreconf not to invoke autopoint or libtoolize; they were run above.
-echo "running: AUTOPOINT=true LIBTOOLIZE=true $AUTORECONF $AUTORECONFFLAGS"
-AUTOPOINT=true LIBTOOLIZE=true $AUTORECONF $AUTORECONFFLAGS \
-  || die "autoreconf failed"
-
-# Get some extra files from gnulib, overriding existing files.
-for file in $gnulib_extra_files; do
-  case $file in
-    */INSTALL) dst=INSTALL;;
-    build-aux/*) dst=$build_aux/${file#build-aux/};;
-    *) dst=$file;;
-  esac
-  symlink_to_dir "$GNULIB_SRCDIR" $file $dst \
-    || die "failed to symlink $file"
-done
-
-if test $with_gettext = yes; then
-  # Create gettext configuration.
-  echo "$0: Creating po/Makevars from po/Makevars.template ..."
-  rm -f po/Makevars
-  sed '
-    /^EXTRA_LOCALE_CATEGORIES *=/s/=.*/= '"$EXTRA_LOCALE_CATEGORIES"'/
-    /^COPYRIGHT_HOLDER *=/s/=.*/= '"$COPYRIGHT_HOLDER"'/
-    /^MSGID_BUGS_ADDRESS *=/s|=.*|= '"$MSGID_BUGS_ADDRESS"'|
-    /^XGETTEXT_OPTIONS *=/{
-      s/$/ \\/
-      a\
-          '"$XGETTEXT_OPTIONS"' $${end_of_xgettext_options+}
-    }
-  ' po/Makevars.template >po/Makevars \
-    || die 'cannot generate po/Makevars'
-
-  # If the 'gettext' module is in use, grab the latest Makefile.in.in.
-  # If only the 'gettext-h' module is in use, assume autopoint already
-  # put the correct version of this file into place.
-  case $gnulib_modules in
-    *gettext-h*) ;;
-    *gettext*)
-      cp $GNULIB_SRCDIR/build-aux/po/Makefile.in.in po/Makefile.in.in \
-        || die "cannot create po/Makefile.in.in"
-      ;;
-  esac
-
-  if test -d runtime-po; then
-    # Similarly for runtime-po/Makevars, but not quite the same.
-    rm -f runtime-po/Makevars
-    sed '
-      /^DOMAIN *=.*/s/=.*/= '"$package"'-runtime/
-      /^subdir *=.*/s/=.*/= runtime-po/
-      /^MSGID_BUGS_ADDRESS *=/s/=.*/= bug-'"$package"'@gnu.org/
-      /^XGETTEXT_OPTIONS *=/{
-        s/$/ \\/
-        a\
-            '"$XGETTEXT_OPTIONS_RUNTIME"' $${end_of_xgettext_options+}
-      }
-    ' po/Makevars.template >runtime-po/Makevars \
-    || die 'cannot generate runtime-po/Makevars'
-
-    # Copy identical files from po to runtime-po.
-    (cd po && cp -p Makefile.in.in *-quot *.header *.sed *.sin ../runtime-po)
-  fi
-fi
-
-bootstrap_epilogue
-
-echo "$0: done.  Now you can run './configure'."
-
-# ----------------------------------------------------------------------------
-
-# Local Variables:
-# eval: (add-hook 'before-save-hook 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC0"
-# time-stamp-end: "; # UTC"
-# End:
+autogen "$@"
diff --git a/autopull.sh b/autopull.sh
index ffb4ba7cb..a5c1b9105 100755
--- a/autopull.sh
+++ b/autopull.sh
@@ -2,7 +2,7 @@
 # Convenience script for fetching auxiliary files that are omitted from
 # the version control repository of this package.
 
-# Copyright (C) 2003-2022 Free Software Foundation, Inc.
+# Copyright (C) 2003-2026 Free Software Foundation, Inc.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -28,246 +28,10 @@
 # Alternatively, you can use an autopull.sh script that is specific
 # to your package.
 
-scriptversion=2022-07-24.15; # UTC
-
 me="$0"
 medir=`dirname "$me"`
 
 # Read the function library and the configuration.
 . "$medir"/bootstrap-funclib.sh
 
-# Ensure that CDPATH is not set.  Otherwise, the output from cd
-# would cause trouble in at least one use below.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-usage() {
-  cat <<EOF
-Usage: $me [OPTION]...
-Bootstrap this package from the checked-out sources.
-
-Optional environment variables:
-  GNULIB_SRCDIR            Specifies the local directory where gnulib
-                           sources reside.  Use this if you already
-                           have gnulib sources on your machine, and
-                           you want to use these sources.
-  GNULIB_REFDIR            Specifies the local directory where a gnulib
-                           repository (with a .git subdirectory) resides.
-                           Use this if you already have gnulib sources
-                           and history on your machine, and do not want
-                           to waste your bandwidth downloading them again.
-  GNULIB_URL               Cloneable URL of the gnulib repository.
-
-Options:
-  --bootstrap-sync         if this bootstrap script is not identical to
-                           the version in the local gnulib sources,
-                           update this script, and then restart it with
-                           /bin/sh or the shell \$CONFIG_SHELL
-  --no-bootstrap-sync      do not check whether bootstrap is out of sync
-  --force                  attempt to bootstrap even if the sources seem
-                           not to have been checked out
-  --no-git                 do not use git to update gnulib.  Requires that
-                           \$GNULIB_SRCDIR or the --gnulib-srcdir option
-                           points to a gnulib repository with the correct
-                           revision
-  --skip-po                do not download po files
-EOF
-  bootstrap_print_option_usage_hook
-  cat <<EOF
-If the file bootstrap.conf exists in the same directory as this script, its
-contents are read as shell variables to configure the bootstrap.
-
-For build prerequisites, environment variables like \$AUTOCONF and \$AMTAR
-are honored.
-
-Gnulib sources can be fetched in various ways:
-
- * If the environment variable GNULIB_SRCDIR is set (either as an
-   environment variable or via the --gnulib-srcdir option), then sources
-   are fetched from that local directory.  If it is a git repository and
-   the configuration variable GNULIB_REVISION is set in bootstrap.conf,
-   then that revision is checked out.
-
- * Otherwise, if this package is in a git repository with a 'gnulib'
-   submodule configured, then that submodule is initialized and updated
-   and sources are fetched from there.  If GNULIB_REFDIR is set (either
-   as an environment variable or via the --gnulib-refdir option) and is
-   a git repository, then it is used as a reference.
-
- * Otherwise, if the 'gnulib' directory does not exist, Gnulib sources
-   are cloned into that directory using git from \$GNULIB_URL, defaulting
-   to $default_gnulib_url.
-   If the configuration variable GNULIB_REVISION is set in bootstrap.conf,
-   then that revision is checked out.
-
- * Otherwise, the existing Gnulib sources in the 'gnulib' directory are
-   used.  If it is a git repository and the configuration variable
-   GNULIB_REVISION is set in bootstrap.conf, then that revision is
-   checked out.
-
-If you maintain a package and want to pin a particular revision of the
-Gnulib sources that has been tested with your package, then there are
-two possible approaches: either configure a 'gnulib' submodule with the
-appropriate revision, or set GNULIB_REVISION (and if necessary
-GNULIB_URL) in bootstrap.conf.
-
-Running without arguments will suffice in most cases.
-EOF
-}
-
-# Parse options.
-
-# Use git to update gnulib sources
-use_git=true
-
-for option
-do
-  case $option in
-  --help)
-    usage
-    exit;;
-  --version)
-    set -e
-    echo "autopull.sh $scriptversion"
-    echo "$copyright"
-    exit 0
-    ;;
-  --skip-po)
-    SKIP_PO=t;;
-  --force)
-    checkout_only_file=;;
-  --bootstrap-sync)
-    bootstrap_sync=true;;
-  --no-bootstrap-sync)
-    bootstrap_sync=false;;
-  --no-git)
-    use_git=false;;
-  *)
-    bootstrap_option_hook $option || die "$option: unknown option";;
-  esac
-done
-
-$use_git || test -n "$GNULIB_SRCDIR" \
-  || die "Error: --no-git requires \$GNULIB_SRCDIR environment variable or --gnulib-srcdir option"
-test -z "$GNULIB_SRCDIR" || test -d "$GNULIB_SRCDIR" \
-  || die "Error: \$GNULIB_SRCDIR environment variable or --gnulib-srcdir option is specified, but does not denote a directory"
-
-if test -n "$checkout_only_file" && test ! -r "$checkout_only_file"; then
-  die "Running this script from a non-checked-out distribution is risky."
-fi
-
-check_build_prerequisites $use_git
-
-if $use_gnulib || $bootstrap_sync; then
-  prepare_GNULIB_SRCDIR
-  if $bootstrap_sync; then
-    upgrade_bootstrap
-  fi
-fi
-
-# Find sha1sum, named gsha1sum on MacPorts, shasum on Mac OS X 10.6.
-# Also find the compatible sha1 utility on the BSDs
-if test x"$SKIP_PO" = x; then
-  find_tool SHA1SUM sha1sum gsha1sum shasum sha1
-fi
-
-# See if we can use gnulib's git-merge-changelog merge driver.
-if $use_git && test -d .git && check_exists git; then
-  if git config merge.merge-changelog.driver >/dev/null ; then
-    :
-  elif check_exists git-merge-changelog; then
-    echo "$0: initializing git-merge-changelog driver"
-    git config merge.merge-changelog.name 'GNU-style ChangeLog merge driver'
-    git config merge.merge-changelog.driver 'git-merge-changelog %O %A %B'
-  else
-    echo "$0: consider installing git-merge-changelog from gnulib"
-  fi
-fi
-
-# ----------------------------- Get translations. -----------------------------
-
-download_po_files() {
-  subdir=$1
-  domain=$2
-  echo "$me: getting translations into $subdir for $domain..."
-  cmd=$(printf "$po_download_command_format" "$subdir" "$domain")
-  eval "$cmd"
-}
-
-# Mirror .po files to $po_dir/.reference and copy only the new
-# or modified ones into $po_dir.  Also update $po_dir/LINGUAS.
-# Note po files that exist locally only are left in $po_dir but will
-# not be included in LINGUAS and hence will not be distributed.
-update_po_files() {
-  # Directory containing primary .po files.
-  # Overwrite them only when we're sure a .po file is new.
-  po_dir=$1
-  domain=$2
-
-  # Mirror *.po files into this dir.
-  # Usually contains *.s1 checksum files.
-  ref_po_dir="$po_dir/.reference"
-
-  test -d $ref_po_dir || mkdir $ref_po_dir || return
-  download_po_files $ref_po_dir $domain \
-    && ls "$ref_po_dir"/*.po 2>/dev/null |
-      sed 's|.*/||; s|\.po$||' > "$po_dir/LINGUAS" || return
-
-  langs=$(cd $ref_po_dir && echo *.po | sed 's/\.po//g')
-  test "$langs" = '*' && langs=x
-  for po in $langs; do
-    case $po in x) continue;; esac
-    new_po="$ref_po_dir/$po.po"
-    cksum_file="$ref_po_dir/$po.s1"
-    if ! test -f "$cksum_file" ||
-        ! test -f "$po_dir/$po.po" ||
-        ! $SHA1SUM -c "$cksum_file" < "$new_po" > /dev/null 2>&1; then
-      echo "$me: updated $po_dir/$po.po..."
-      cp "$new_po" "$po_dir/$po.po" \
-          && $SHA1SUM < "$new_po" > "$cksum_file" || return
-    fi
-  done
-}
-
-case $SKIP_PO in
-'')
-  if test -d po; then
-    update_po_files po $package || exit
-  fi
-
-  if test -d runtime-po; then
-    update_po_files runtime-po $package-runtime || exit
-  fi;;
-esac
-
-# -----------------------------------------------------------------------------
-
-bootstrap_post_pull_hook \
-  || die "bootstrap_post_pull_hook failed"
-
-# Don't proceed if there are uninitialized submodules.  In particular,
-# autogen.sh will remove dangling links, which might be links into
-# uninitialized submodules.
-# But it's OK if the 'gnulib' submodule is uninitialized, as long as
-# GNULIB_SRCDIR is set.
-if $use_git; then
-  # Uninitialized submodules are listed with an initial dash.
-  uninitialized=`git submodule | grep '^-' | awk '{ print $2 }'`
-  if test -n "$GNULIB_SRCDIR"; then
-    uninitialized=`echo "$uninitialized" | grep -v '^gnulib$'`
-  fi
-  if test -n "$uninitialized"; then
-    die "Some git submodules are not initialized: "`echo "$uninitialized" | tr '\n' ',' | sed -e 's|,$|.|'`" Either use option '--no-git', or run 'git submodule update --init' and bootstrap again."
-  fi
-fi
-
-echo "$0: done.  Now you can run './autogen.sh'."
-
-# ----------------------------------------------------------------------------
-
-# Local Variables:
-# eval: (add-hook 'before-save-hook 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC0"
-# time-stamp-end: "; # UTC"
-# End:
+autopull "$@"
diff --git a/bootstrap b/bootstrap
index cf8d007f6..6542faafa 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1,7 +1,9 @@
 #! /bin/sh
 # Bootstrap this package from checked-out sources.
 
-# Copyright (C) 2003-2022 Free Software Foundation, Inc.
+scriptversion=2025-06-10.02; # UTC
+
+# Copyright (C) 2003-2025 Free Software Foundation, Inc.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -26,8 +28,6 @@
 
 # Please report bugs or propose patches to bug-gnulib@gnu.org.
 
-scriptversion=2022-07-29.23; # UTC
-
 me="$0"
 medir=`dirname "$me"`
 
@@ -43,35 +43,55 @@ Optional environment variables:
   GNULIB_SRCDIR            Specifies the local directory where gnulib
                            sources reside.  Use this if you already
                            have gnulib sources on your machine, and
-                           do not want to waste your bandwidth downloading
-                           them again.
-  GNULIB_URL               Cloneable URL of the gnulib repository.
+                           you want to use these sources.
+  GNULIB_REFDIR            Specifies the local directory where a gnulib
+                           repository (with a .git subdirectory) resides.
+                           Use this if you already have gnulib sources
+                           and history on your machine, and do not want
+                           to waste your bandwidth downloading them again.
+                           Only used for phase 1 (--pull).
+  GNULIB_URL               URL of the gnulib repository.  The default is
+                           $default_gnulib_url,
+                           which is Gnulib's upstream repository.
+                           Only used for phase 1 (--pull).
 
 Options:
-  --gnulib-srcdir=DIRNAME  specify the local directory where gnulib
+
+  --pull                   Do phase 1: Pull files from the network.
+  --gen                    Do phase 2: Generate files from local files
+                           (no network access).
+                           (The default is to do both phases.)
+
+  --gnulib-srcdir=DIRNAME  Specifies the local directory where gnulib
                            sources reside.  Use this if you already
                            have gnulib sources on your machine, and
                            you want to use these sources.  Defaults
-                           to \$GNULIB_SRCDIR
-  --gnulib-refdir=DIRNAME  specify the local directory where a gnulib
+                           to \$GNULIB_SRCDIR.
+  --gnulib-refdir=DIRNAME  Specifies the local directory where a gnulib
                            repository (with a .git subdirectory) resides.
                            Use this if you already have gnulib sources
                            and history on your machine, and do not want
                            to waste your bandwidth downloading them again.
-                           Defaults to \$GNULIB_REFDIR
-  --bootstrap-sync         if this bootstrap script is not identical to
+                           Defaults to \$GNULIB_REFDIR.
+                           Only used for phase 1 (--pull).
+
+  --bootstrap-sync         If this bootstrap script is not identical to
                            the version in the local gnulib sources,
                            update this script, and then restart it with
-                           /bin/sh or the shell \$CONFIG_SHELL
-  --no-bootstrap-sync      do not check whether bootstrap is out of sync
-  --copy                   copy files instead of creating symbolic links
-  --force                  attempt to bootstrap even if the sources seem
-                           not to have been checked out
-  --no-git                 do not use git to update gnulib.  Requires that
+                           /bin/sh or the shell \$CONFIG_SHELL.
+  --no-bootstrap-sync      Do not check whether bootstrap is out of sync.
+
+  --copy                   Copy files instead of creating symbolic links.
+                           Only used for phase 2 (--gen).
+  --force                  Attempt to bootstrap even if the sources seem
+                           not to have been checked out.
+  --no-git                 Do not use git to update gnulib.  Requires that
                            \$GNULIB_SRCDIR or the --gnulib-srcdir option
                            points to a gnulib repository with the correct
-                           revision
-  --skip-po                do not download po files
+                           revision.
+                           Only used for phase 1 (--pull).
+  --skip-po                Do not download *.po files.
+                           Only used for phase 1 (--pull).
 EOF
   bootstrap_print_option_usage_hook
   cat <<EOF
@@ -83,11 +103,11 @@ are honored.
 
 Gnulib sources can be fetched in various ways:
 
- * If the environment variable GNULIB_SRCDIR is set (either as an
-   environment variable or via the --gnulib-srcdir option), then sources
-   are fetched from that local directory.  If it is a git repository and
-   the configuration variable GNULIB_REVISION is set in bootstrap.conf,
-   then that revision is checked out.
+ * If GNULIB_SRCDIR is set (either as an environment variable or via the
+   --gnulib-srcdir option), then sources are fetched from that local
+   directory.  If it is a git repository and the configuration variable
+   GNULIB_REVISION is set in bootstrap.conf, then that revision is
+   checked out.
 
  * Otherwise, if this package is in a git repository with a 'gnulib'
    submodule configured, then that submodule is initialized and updated
@@ -97,7 +117,8 @@ Gnulib sources can be fetched in various ways:
 
  * Otherwise, if the 'gnulib' directory does not exist, Gnulib sources
    are cloned into that directory using git from \$GNULIB_URL, defaulting
-   to $default_gnulib_url.
+   to $default_gnulib_url; if GNULIB_REFDIR is set and is a git repository
+   its contents may be used to accelerate the process.
    If the configuration variable GNULIB_REVISION is set in bootstrap.conf,
    then that revision is checked out.
 
@@ -118,6 +139,10 @@ EOF
 
 # Parse options.
 
+# Whether to pull and generate.
+pull=false
+gen=false
+
 # Whether to use copies instead of symlinks.
 copy=false
 
@@ -132,10 +157,14 @@ do
     exit;;
   --version)
     set -e
-    echo "bootstrap $scriptversion"
+    echo "bootstrap $scriptversion lib $scriptlibversion"
     echo "$copyright"
     exit 0
     ;;
+  --pull)
+    pull=true;;
+  --gen)
+    gen=true;;
   --gnulib-srcdir=*)
     GNULIB_SRCDIR=${option#--gnulib-srcdir=};;
   --gnulib-refdir=*)
@@ -157,10 +186,15 @@ do
   esac
 done
 
+# Default is to do both.
+$pull || $gen || pull=true gen=true
+
 $use_git || test -n "$GNULIB_SRCDIR" \
-  || die "Error: --no-git requires \$GNULIB_SRCDIR environment variable or --gnulib-srcdir option"
+  || die "Error: --no-git requires \$GNULIB_SRCDIR environment variable" \
+         "or --gnulib-srcdir option"
 test -z "$GNULIB_SRCDIR" || test -d "$GNULIB_SRCDIR" \
-  || die "Error: \$GNULIB_SRCDIR environment variable or --gnulib-srcdir option is specified, but does not denote a directory"
+  || die "Error: \$GNULIB_SRCDIR environment variable or --gnulib-srcdir" \
+         "option is specified, but does not denote a directory"
 
 if test -n "$checkout_only_file" && test ! -r "$checkout_only_file"; then
   die "Bootstrapping from a non-checked-out distribution is risky."
@@ -168,47 +202,45 @@ fi
 
 check_build_prerequisites $use_git
 
-if ! test -f "$medir"/bootstrap-funclib.sh; then
-  # We have only completed the first phase of an upgrade from a bootstrap
-  # version < 2022-07-24. Need to do the second phase now.
-  bootstrap_sync=true
-fi
-
 if $bootstrap_sync; then
   prepare_GNULIB_SRCDIR
-  upgrade_bootstrap
+  upgrade_bootstrap "$@"
   # Since we have now upgraded if needed, no need to try it a second time below.
   bootstrap_sync=false
 fi
 
 echo "$0: Bootstrapping from checked-out $package sources..."
 
-# Pass GNULIB_SRCDIR to autopull.sh and autogen.sh.
+# Pass GNULIB_SRCDIR and GNULIB_REFDIR to any subsidiary commands that care.
 export GNULIB_SRCDIR
-
-# Pass GNULIB_REFDIR to autopull.sh.
 export GNULIB_REFDIR
 
-if $use_git || test -z "$SKIP_PO"; then
-  "$medir"/autopull.sh \
-      `if $bootstrap_sync; then echo ' --bootstrap-sync'; else echo ' --no-bootstrap-sync'; fi` \
+if $pull && { $use_git || test -z "$SKIP_PO"; }; then
+  autopull \
+      `if $bootstrap_sync; then
+         echo ' --bootstrap-sync'
+       else
+         echo ' --no-bootstrap-sync'
+       fi` \
       `if test -z "$checkout_only_file"; then echo ' --force'; fi` \
       `if ! $use_git; then echo ' --no-git'; fi` \
       `if test -n "$SKIP_PO"; then echo ' --skip-po'; fi` \
-    || die "autopull.sh failed."
+    || die "could not fetch auxiliary files"
 fi
 
-"$medir"/autogen.sh \
-    `if $copy; then echo ' --copy'; fi` \
-    `if test -z "$checkout_only_file"; then echo ' --force'; fi` \
-  || die "autogen.sh failed."
+if $gen; then
+  autogen \
+      `if $copy; then echo ' --copy'; fi` \
+      `if test -z "$checkout_only_file"; then echo ' --force'; fi` \
+    || die "could not generate auxiliary files"
+fi
 
 # ----------------------------------------------------------------------------
 
 # Local Variables:
-# eval: (add-hook 'before-save-hook 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp nil t)
 # time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-format: "%Y-%02m-%02d.%02H"
 # time-stamp-time-zone: "UTC0"
 # time-stamp-end: "; # UTC"
 # End:
diff --git a/bootstrap-funclib.sh b/bootstrap-funclib.sh
index f66f338c5..3bedf3677 100644
--- a/bootstrap-funclib.sh
+++ b/bootstrap-funclib.sh
@@ -1,6 +1,8 @@
 # A library of shell functions for autopull.sh, autogen.sh, and bootstrap.
 
-# Copyright (C) 2003-2022 Free Software Foundation, Inc.
+scriptlibversion=2025-06-10.02; # UTC
+
+# Copyright (C) 2003-2026 Free Software Foundation, Inc.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -23,8 +25,6 @@
 # file also maintained in your version control; gnulib comes with a
 # template build-aux/bootstrap.conf to get you started.
 
-scriptversion=2022-07-24.15; # UTC
-
 nl='
 '
 
@@ -38,7 +38,7 @@ PERL="${PERL-perl}"
 default_gnulib_url=https://git.savannah.gnu.org/git/gnulib.git
 
 # Copyright year, for the --version output.
-copyright_year=`echo "$scriptversion" | sed -e 's/[^0-9].*//'`
+copyright_year=`echo "$scriptlibversion" | 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.
@@ -115,7 +115,8 @@ po_download_command_format=\
 "wget --mirror --level=1 -nd -nv -A.po -P '%s' \
  https://translationproject.org/latest/%s/"
 
-# Prefer a non-empty tarname (4th argument of AC_INIT if given), else
+# When extracting the package name from an AC_INIT invocation,
+# prefer a non-empty tarname (4th argument of AC_INIT if given), else
 # fall back to the package name (1st argument with munging).
 extract_package_name='
   /^AC_INIT(\[*/{
@@ -127,17 +128,20 @@ extract_package_name='
        q
      }
      s/[],)].*//
-     s/^GNU //
-     y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/
-     s/[^abcdefghijklmnopqrstuvwxyz0123456789_]/-/g
      p
   }
 '
-package=$(${AUTOCONF:-autoconf} --trace AC_INIT:\$4 configure.ac 2>/dev/null)
+normalize_package_name='
+  s/^GNU //
+  y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/
+  s/[^abcdefghijklmnopqrstuvwxyz0123456789_]/-/g
+'
+package=$(${AUTOCONF:-autoconf} --trace 'AC_INIT:$4' configure.ac 2>/dev/null)
 if test -z "$package"; then
   package=$(sed -n "$extract_package_name" configure.ac) \
       || die 'cannot find package name in configure.ac'
 fi
+package=$(echo "$package" | sed "$normalize_package_name")
 gnulib_name=lib$package
 
 build_aux=build-aux
@@ -303,7 +307,7 @@ check_versions() {
     # Handle the still-experimental Automake-NG programs specially.
     # They remain named as the mainstream Automake programs ("automake",
     # and "aclocal") to avoid gratuitous incompatibilities with
-    # pre-existing usages (by, say, autoreconf, or custom autogen.sh
+    # preexisting usages (by, say, autoreconf, or custom autogen.sh
     # scripts), but correctly identify themselves (as being part of
     # "GNU automake-ng") when asked their version.
     case $app in
@@ -441,10 +445,9 @@ find_tool ()
 # --------------------- Preparing GNULIB_SRCDIR for use. ---------------------
 # This is part of autopull.sh, but bootstrap needs it too, for self-upgrading.
 
+# cleanup_gnulib fails, removing the directory $gnulib_path first.
 cleanup_gnulib() {
   status=$?
-  # XXX It's a bad idea to erase the submodule directory if it contains local
-  #     modifications.
   rm -fr "$gnulib_path"
   exit $status
 }
@@ -460,92 +463,157 @@ prepare_GNULIB_SRCDIR ()
     # We already checked that $GNULIB_SRCDIR references a directory.
     # Verify that it contains a gnulib checkout.
     test -f "$GNULIB_SRCDIR/gnulib-tool" \
-      || die "Error: --gnulib-srcdir or \$GNULIB_SRCDIR is specified, but does not contain gnulib-tool"
-  elif $use_git; then
+      || die "Error: --gnulib-srcdir or \$GNULIB_SRCDIR is specified," \
+             "but does not contain gnulib-tool"
+    if test -n "$GNULIB_REVISION" && $use_git; then
+      # The 'git checkout "$GNULIB_REVISION"' command succeeds if the
+      # GNULIB_REVISION is a commit hash that exists locally, or if it is
+      # branch name that can be fetched from origin. It fails, however,
+      # if the GNULIB_REVISION is a commit hash that only exists in
+      # origin. In this case, we need a 'git fetch' and then retry
+      # 'git checkout "$GNULIB_REVISION"'.
+      git -C "$GNULIB_SRCDIR" checkout "$GNULIB_REVISION" 2>/dev/null \
+      || { git -C "$GNULIB_SRCDIR" fetch origin \
+           && git -C "$GNULIB_SRCDIR" checkout "$GNULIB_REVISION"; } \
+      || exit $?
+    fi
+  else
+    if ! $use_git; then
+      die "Error: --no-git is specified," \
+          "but neither --gnulib-srcdir nor \$GNULIB_SRCDIR is specified"
+    fi
+    if git submodule -h | grep -- --reference > /dev/null; then
+      :
+    else
+      die "git version is too old, git >= 1.6.4 is required"
+    fi
     gnulib_path=$(git_modules_config submodule.gnulib.path)
-    test -z "$gnulib_path" && gnulib_path=gnulib
-
-    # Get gnulib files.  Populate $gnulib_path, possibly updating a
-    # submodule, for use in the rest of the script.
-
-    if test -n "$GNULIB_REFDIR" && test -d "$GNULIB_REFDIR"/.git \
-       && git_modules_config submodule.gnulib.url >/dev/null; then
-      # Use GNULIB_REFDIR as a reference.
-      echo "$0: getting gnulib files..."
-      if git submodule -h|grep -- --reference > /dev/null; then
-        # Prefer the one-liner available in git 1.6.4 or newer.
-        git submodule update --init --reference "$GNULIB_REFDIR" \
-          "$gnulib_path" || exit $?
+    if test -n "$gnulib_path"; then
+      # A submodule 'gnulib' is configured.
+      # Get gnulib files.  Populate $gnulib_path, updating the submodule.
+      if test -n "$GNULIB_REFDIR" && test -d "$GNULIB_REFDIR"/.git; then
+        # Use GNULIB_REFDIR as a reference.
+        echo "$0: getting gnulib files..."
+        git submodule update --init --reference "$GNULIB_REFDIR" "$gnulib_path"\
+          || exit $?
       else
-        # This fallback allows at least git 1.5.5.
-        if test -f "$gnulib_path"/gnulib-tool; then
-          # Since file already exists, assume submodule init already complete.
+        # GNULIB_REFDIR is not set or not usable. Ignore it.
+        if git_modules_config submodule.gnulib.url >/dev/null; then
+          echo "$0: getting gnulib files..."
+          git submodule init -- "$gnulib_path" || exit $?
           git submodule update -- "$gnulib_path" || exit $?
         else
-          # Older git can't clone into an empty directory.
-          rmdir "$gnulib_path" 2>/dev/null
-          git clone --reference "$GNULIB_REFDIR" \
-            "$(git_modules_config submodule.gnulib.url)" "$gnulib_path" \
-            && git submodule init -- "$gnulib_path" \
-            && git submodule update -- "$gnulib_path" \
-            || exit $?
+          die "Error: submodule 'gnulib' has no configured url"
         fi
       fi
     else
-      # GNULIB_REFDIR is not set or not usable. Ignore it.
-      if git_modules_config submodule.gnulib.url >/dev/null; then
-        echo "$0: getting gnulib files..."
-        git submodule init -- "$gnulib_path" || exit $?
-        git submodule update -- "$gnulib_path" || exit $?
-
-      elif [ ! -d "$gnulib_path" ]; then
+      gnulib_path='gnulib'
+      if test ! -d "$gnulib_path"; then
+        # The subdirectory 'gnulib' does not yet exist. Clone into it.
         echo "$0: getting gnulib files..."
-
-        trap cleanup_gnulib 1 2 13 15
-
-        shallow=
-        if test -z "$GNULIB_REVISION"; then
-          if git clone -h 2>&1 | grep -- --depth > /dev/null; then
-            shallow='--depth 2'
-          fi
-          git clone $shallow ${GNULIB_URL:-$default_gnulib_url} "$gnulib_path" \
-            || cleanup_gnulib
+        trap cleanup_gnulib HUP INT PIPE TERM
+        gnulib_url=${GNULIB_URL:-$default_gnulib_url}
+        if test -n "$GNULIB_REFDIR" && test -d "$GNULIB_REFDIR"/.git; then
+          # Use GNULIB_REFDIR as a reference.
+          git clone "$GNULIB_REFDIR" "$gnulib_path" \
+          && git -C "$gnulib_path" remote set-url origin "$gnulib_url" \
+          && if test -z "$GNULIB_REVISION"; then
+               git -C "$gnulib_path" pull origin \
+               && {
+                 # We want the default branch of "$gnulib_url" (since that's
+                 # the behaviour if GNULIB_REFDIR is not specified), not the
+                 # current branch of "$GNULIB_REFDIR".
+                 default_branch=`LC_ALL=C git -C "$gnulib_path" \
+                                              remote show origin \
+                                 | sed -n -e 's/^ *HEAD branch: //p'`
+                 test -n "$default_branch" || default_branch='master'
+                 git -C "$gnulib_path" checkout "$default_branch"
+               }
+             else
+               # The 'git checkout "$GNULIB_REVISION"' command succeeds if the
+               # GNULIB_REVISION is a commit hash that exists locally, or if it
+               # is a branch name that can be fetched from origin. It fails,
+               # however, if the GNULIB_REVISION is a commit hash that only
+               # exists in origin. In this case, we need a 'git fetch' and then
+               # retry 'git checkout "$GNULIB_REVISION"'.
+               git -C "$gnulib_path" checkout "$GNULIB_REVISION" 2>/dev/null \
+               || { git -C "$gnulib_path" fetch origin \
+                    && git -C "$gnulib_path" checkout "$GNULIB_REVISION"; }
+             fi \
+          || cleanup_gnulib
         else
-          if git fetch -h 2>&1 | grep -- --depth > /dev/null; then
-            shallow='--depth 2'
+          # GNULIB_REFDIR is not set or not usable. Ignore it.
+          shallow='--depth 2'
+          if test -z "$GNULIB_REVISION"; then
+            git clone $shallow "$gnulib_url" "$gnulib_path" \
+              || cleanup_gnulib
+          else
+            # Only want a shallow checkout of $GNULIB_REVISION, but git does not
+            # support cloning by commit hash. So attempt a shallow fetch by
+            # commit hash to minimize the amount of data downloaded and changes
+            # needed to be processed, which can drastically reduce download and
+            # processing time for checkout. If the fetch by commit fails, a
+            # shallow fetch cannot be performed because we do not know what the
+            # depth of the commit is without fetching all commits. So fall back
+            # to fetching all commits.
+            # $GNULIB_REVISION can be a commit id, a tag name, or a branch name.
+            mkdir -p "$gnulib_path"
+            # Use a -c option to silence an annoying message
+            # "hint: Using 'master' as the name for the initial branch."
+            # (cf. <https://stackoverflow.com/questions/65524512/>).
+            git -C "$gnulib_path" -c init.defaultBranch=master init
+            git -C "$gnulib_path" remote add origin "$gnulib_url"
+            if git -C "$gnulib_path" fetch $shallow origin "$GNULIB_REVISION"
+            then
+              # "git fetch" of the specific commit succeeded.
+              git -C "$gnulib_path" reset --hard FETCH_HEAD \
+                || cleanup_gnulib
+              # "git fetch" does not fetch tags (at least in git version 2.43).
+              # If $GNULIB_REVISION is a tag (not a commit id or branch name),
+              # add the tag explicitly.
+              revision=`git -C "$gnulib_path" log -1 --pretty=format:%H`
+              branch=`LC_ALL=C git -C "$gnulib_path" remote show origin \
+                      | sed -n -e 's/^    \([^ ]*\) * tracked$/\1/p'`
+              test "$revision" = "$GNULIB_REVISION" \
+                || test "$branch" = "$GNULIB_REVISION" \
+                || git -C "$gnulib_path" tag "$GNULIB_REVISION"
+            else
+              # Fetch the entire repository.
+              git -C "$gnulib_path" fetch origin \
+                || cleanup_gnulib
+              git -C "$gnulib_path" checkout "$GNULIB_REVISION" \
+                || cleanup_gnulib
+            fi
+          fi
+        fi
+        trap - HUP INT PIPE TERM
+      else
+        # The subdirectory 'gnulib' already exists.
+        if test -n "$GNULIB_REVISION"; then
+          if test -d "$gnulib_path/.git"; then
+            # The 'git checkout "$GNULIB_REVISION"' command succeeds if the
+            # GNULIB_REVISION is a commit hash that exists locally, or if it
+            # is a branch name that can be fetched from origin. It fails,
+            # however, if the GNULIB_REVISION is a commit hash that only
+            # exists in origin. In this case, we need a 'git fetch' and then
+            # retry 'git checkout "$GNULIB_REVISION"'.
+            git -C "$gnulib_path" checkout "$GNULIB_REVISION" 2>/dev/null \
+            || { git -C "$gnulib_path" fetch origin \
+                 && git -C "$gnulib_path" checkout "$GNULIB_REVISION"; } \
+            || exit $?
+          else
+            die "Error: GNULIB_REVISION is specified in bootstrap.conf," \
+                "but '$gnulib_path' contains no git history"
           fi
-          mkdir -p "$gnulib_path"
-          # Only want a shallow checkout of $GNULIB_REVISION, but git does not
-          # support cloning by commit hash. So attempt a shallow fetch by commit
-          # hash to minimize the amount of data downloaded and changes needed to
-          # be processed, which can drastically reduce download and processing
-          # time for checkout. If the fetch by commit fails, a shallow fetch can
-          # not be performed because we do not know what the depth of the commit
-          # is without fetching all commits. So fallback to fetching all commits.
-          git -C "$gnulib_path" init
-          git -C "$gnulib_path" remote add origin \
-              ${GNULIB_URL:-$default_gnulib_url}
-          git -C "$gnulib_path" fetch $shallow origin "$GNULIB_REVISION" \
-            || git -C "$gnulib_path" fetch origin \
-            || cleanup_gnulib
-          git -C "$gnulib_path" reset --hard FETCH_HEAD
         fi
-
-        trap - 1 2 13 15
       fi
     fi
-    GNULIB_SRCDIR=$gnulib_path
-    # Verify that the submodule contains a gnulib checkout.
+    # Verify that $gnulib_path contains a gnulib checkout.
     test -f "$gnulib_path/gnulib-tool" \
-      || die "Error: $gnulib_path is supposed to contain a gnulib checkout, but does not contain gnulib-tool"
-  fi
-
-  # XXX Should this be done if $use_git is false?
-  if test -d "$GNULIB_SRCDIR"/.git && test -n "$GNULIB_REVISION" \
-     && ! git_modules_config submodule.gnulib.url >/dev/null; then
-    (cd "$GNULIB_SRCDIR" && git checkout "$GNULIB_REVISION") || cleanup_gnulib
+      || die "Error: '$gnulib_path' is supposed to contain a gnulib checkout," \
+             "but does not contain gnulib-tool"
+    GNULIB_SRCDIR=$gnulib_path
   fi
-
   # $GNULIB_SRCDIR now points to the version of gnulib to use, and
   # we no longer need to use git or $gnulib_path below here.
 }
@@ -554,20 +622,39 @@ prepare_GNULIB_SRCDIR ()
 
 upgrade_bootstrap ()
 {
-  { cmp -s "$medir"/bootstrap "$GNULIB_SRCDIR/top/bootstrap" \
-    && cmp -s "$medir"/bootstrap-funclib.sh "$GNULIB_SRCDIR/top/bootstrap-funclib.sh" \
-    && cmp -s "$medir"/autopull.sh "$GNULIB_SRCDIR/top/autopull.sh" \
-    && cmp -s "$medir"/autogen.sh "$GNULIB_SRCDIR/top/autogen.sh"; \
-  } || {
-    echo "$0: updating bootstrap & companions and restarting..."
+  if test -f "$medir"/bootstrap-funclib.sh; then
+    update_lib=true
+    { cmp -s "$medir"/bootstrap "$GNULIB_SRCDIR/top/bootstrap" \
+      && cmp -s "$medir"/bootstrap-funclib.sh \
+                "$GNULIB_SRCDIR/top/bootstrap-funclib.sh" \
+      && cmp -s "$medir"/autopull.sh "$GNULIB_SRCDIR/top/autopull.sh" \
+      && cmp -s "$medir"/autogen.sh "$GNULIB_SRCDIR/top/autogen.sh"; \
+    }
+  else
+    update_lib=false
+    cmp -s "$medir"/bootstrap "$GNULIB_SRCDIR/build-aux/bootstrap"
+  fi || {
+    if $update_lib; then
+      echo "$0: updating bootstrap & companions and restarting..."
+    else
+      echo "$0: updating bootstrap and restarting..."
+    fi
     case $(sh -c 'echo "$1"' -- a) in
       a) ignored=--;;
       *) ignored=ignored;;
     esac
+    u=$update_lib
     exec sh -c \
-      '{ if test -f "$1"; then cp "$1" "$3"; else cp "$2" "$3"; fi; } && { if test -f "$4"; then cp "$4" "$5"; else rm -f "$5"; fi; } && { if test -f "$6"; then cp "$6" "$7"; else rm -f "$7"; fi; } && { if test -f "$8"; then cp "$8" "$9"; else rm -f "$9"; fi; } && shift && shift && shift && shift && shift && shift && shift && shift && shift && exec "${CONFIG_SHELL-/bin/sh}" "$@"' \
+      '{ if '$u' && test -f "$1"; then cp "$1" "$3"; else cp "$2" "$3"; fi; } &&
+       { if '$u' && test -f "$4"; then cp "$4" "$5"; else rm -f "$5"; fi; } &&
+       { if '$u' && test -f "$6"; then cp "$6" "$7"; else rm -f "$7"; fi; } &&
+       { if '$u' && test -f "$8"; then cp "$8" "$9"; else rm -f "$9"; fi; } &&
+       shift && shift && shift && shift && shift &&
+       shift && shift && shift && shift &&
+       exec "${CONFIG_SHELL-/bin/sh}" "$@"' \
       $ignored \
-      "$GNULIB_SRCDIR/top/bootstrap" "$GNULIB_SRCDIR/build-aux/bootstrap" "$medir/bootstrap" \
+      "$GNULIB_SRCDIR/top/bootstrap" "$GNULIB_SRCDIR/build-aux/bootstrap" \
+      "$medir/bootstrap" \
       "$GNULIB_SRCDIR/top/bootstrap-funclib.sh" "$medir/bootstrap-funclib.sh" \
       "$GNULIB_SRCDIR/top/autopull.sh" "$medir/autopull.sh" \
       "$GNULIB_SRCDIR/top/autogen.sh" "$medir/autogen.sh" \
@@ -583,12 +670,713 @@ else
   use_gnulib=true
 fi
 
+# -------- Fetch auxiliary files from the network.  --------------------------
+
+autopull_usage() {
+  cat <<EOF
+Usage: $me [OPTION]...
+Bootstrap this package from the checked-out sources, phase 1:
+Pull files from the network.
+
+Optional environment variables:
+  GNULIB_SRCDIR            Specifies the local directory where gnulib
+                           sources reside.  Use this if you already
+                           have gnulib sources on your machine, and
+                           you want to use these sources.
+  GNULIB_REFDIR            Specifies the local directory where a gnulib
+                           repository (with a .git subdirectory) resides.
+                           Use this if you already have gnulib sources
+                           and history on your machine, and do not want
+                           to waste your bandwidth downloading them again.
+  GNULIB_URL               URL of the gnulib repository.  The default is
+                           $default_gnulib_url,
+                           which is Gnulib's upstream repository.
+
+Options:
+
+  --bootstrap-sync         If this bootstrap script is not identical to
+                           the version in the local gnulib sources,
+                           update this script, and then restart it with
+                           /bin/sh or the shell \$CONFIG_SHELL.
+  --no-bootstrap-sync      Do not check whether bootstrap is out of sync.
+
+  --force                  Attempt to bootstrap even if the sources seem
+                           not to have been checked out.
+  --no-git                 Do not use git to update gnulib.  Requires that
+                           \$GNULIB_SRCDIR points to a gnulib repository
+                           with the correct revision.
+  --skip-po                Do not download *.po files.
+EOF
+  bootstrap_print_option_usage_hook
+  cat <<EOF
+If the file bootstrap.conf exists in the same directory as this script, its
+contents are read as shell variables to configure the bootstrap.
+
+For build prerequisites, environment variables like \$AUTOCONF and \$AMTAR
+are honored.
+
+Gnulib sources can be fetched in various ways:
+
+ * If the environment variable GNULIB_SRCDIR is set, then sources are
+   fetched from that local directory.  If it is a git repository and the
+   configuration variable GNULIB_REVISION is set in bootstrap.conf, then
+   that revision is checked out.
+
+ * Otherwise, if this package is in a git repository with a 'gnulib'
+   submodule configured, then that submodule is initialized and updated
+   and sources are fetched from there.  If the environment variable
+   GNULIB_REFDIR is set and is a git repository, then it is used as a
+   reference.
+
+ * Otherwise, if the 'gnulib' directory does not exist, Gnulib sources
+   are cloned into that directory using git from \$GNULIB_URL, defaulting
+   to $default_gnulib_url; if GNULIB_REFDIR is set and is a git repository
+   its contents may be used to accelerate the process.
+   If the configuration variable GNULIB_REVISION is set in bootstrap.conf,
+   then that revision is checked out.
+
+ * Otherwise, the existing Gnulib sources in the 'gnulib' directory are
+   used.  If it is a git repository and the configuration variable
+   GNULIB_REVISION is set in bootstrap.conf, then that revision is
+   checked out.
+
+If you maintain a package and want to pin a particular revision of the
+Gnulib sources that has been tested with your package, then there are
+two possible approaches: either configure a 'gnulib' submodule with the
+appropriate revision, or set GNULIB_REVISION (and if necessary
+GNULIB_URL) in bootstrap.conf.
+
+Running without arguments will suffice in most cases.
+EOF
+}
+
+# Fetch auxiliary files that are omitted from the version control
+# repository of this package.
+autopull()
+{
+  # Ensure that CDPATH is not set.  Otherwise, the output from cd
+  # would cause trouble in at least one use below.
+  (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+  # Parse options.
+
+  # Use git to update gnulib sources
+  use_git=true
+
+  for option
+  do
+    case $option in
+    --help)
+      autopull_usage
+      return;;
+    --version)
+      set -e
+      echo "autopull.sh $scriptlibversion"
+      echo "$copyright"
+      return 0
+      ;;
+    --skip-po)
+      SKIP_PO=t;;
+    --force)
+      checkout_only_file=;;
+    --bootstrap-sync)
+      bootstrap_sync=true;;
+    --no-bootstrap-sync)
+      bootstrap_sync=false;;
+    --no-git)
+      use_git=false;;
+    *)
+      bootstrap_option_hook $option || die "$option: unknown option";;
+    esac
+  done
+
+  $use_git || test -n "$GNULIB_SRCDIR" \
+    || die "Error: --no-git requires \$GNULIB_SRCDIR environment variable" \
+           "or --gnulib-srcdir option"
+  test -z "$GNULIB_SRCDIR" || test -d "$GNULIB_SRCDIR" \
+    || die "Error: \$GNULIB_SRCDIR environment variable" \
+           "or --gnulib-srcdir option is specified," \
+           "but does not denote a directory"
+
+  if test -n "$checkout_only_file" && test ! -r "$checkout_only_file"; then
+    die "Running this script from a non-checked-out distribution is risky."
+  fi
+
+  check_build_prerequisites $use_git
+
+  if $use_gnulib || $bootstrap_sync; then
+    prepare_GNULIB_SRCDIR
+    if $bootstrap_sync; then
+      upgrade_bootstrap "$@"
+    fi
+  fi
+
+  # Find sha1sum, named gsha1sum on MacPorts, shasum on Mac OS X 10.6.
+  # Also find the compatible sha1 utility on the BSDs
+  if test x"$SKIP_PO" = x; then
+    find_tool SHA1SUM sha1sum gsha1sum shasum sha1
+  fi
+
+  # See if we can use gnulib's git-merge-changelog merge driver.
+  if $use_git && test -d .git && check_exists git; then
+    if git config merge.merge-changelog.driver >/dev/null ; then
+      :
+    elif check_exists git-merge-changelog; then
+      echo "$0: initializing git-merge-changelog driver"
+      git config merge.merge-changelog.name 'GNU-style ChangeLog merge driver'
+      git config merge.merge-changelog.driver 'git-merge-changelog %O %A %B'
+    else
+      echo "$0: consider installing git-merge-changelog from gnulib"
+    fi
+  fi
+
+  case $SKIP_PO in
+  '')
+    if test -d po; then
+      update_po_files po $package || return
+    fi
+
+    if test -d runtime-po; then
+      update_po_files runtime-po $package-runtime || return
+    fi;;
+  esac
+
+  # ---------------------------------------------------------------------------
+
+  bootstrap_post_pull_hook \
+    || die "bootstrap_post_pull_hook failed"
+
+  # Don't proceed if there are uninitialized submodules.  In particular,
+  # autogen.sh will remove dangling links, which might be links into
+  # uninitialized submodules.
+  # But it's OK if the 'gnulib' submodule is uninitialized, as long as
+  # GNULIB_SRCDIR is set.
+  if $use_git; then
+    # Uninitialized submodules are listed with an initial dash.
+    uninitialized=`git submodule | grep '^-' | awk '{ print $2 }'`
+    if test -n "$GNULIB_SRCDIR"; then
+      uninitialized=`echo "$uninitialized" | grep -v '^gnulib$'`
+    fi
+    if test -n "$uninitialized"; then
+      uninit_comma=`echo "$uninitialized" | tr '\n' ',' | sed -e 's|,$|.|'`
+      die "Some git submodules are not initialized: "$uninit_comma \
+          "Either use option '--no-git'," \
+          "or run 'git submodule update --init' and bootstrap again."
+    fi
+  fi
+
+  if test -f "$medir"/autogen.sh; then
+    echo "$0: done.  Now you can run '$medir/autogen.sh'."
+  fi
+}
+
+# ----------------------------- Get translations. -----------------------------
+
+download_po_files() {
+  subdir=$1
+  domain=$2
+  echo "$me: getting translations into $subdir for $domain..."
+  cmd=$(printf "$po_download_command_format" "$subdir" "$domain")
+  eval "$cmd"
+}
+
+# Mirror .po files to $po_dir/.reference and copy only the new
+# or modified ones into $po_dir.  Also update $po_dir/LINGUAS.
+# Note po files that exist locally only are left in $po_dir but will
+# not be included in LINGUAS and hence will not be distributed.
+update_po_files() {
+  # Directory containing primary .po files.
+  # Overwrite them only when we're sure a .po file is new.
+  po_dir=$1
+  domain=$2
+
+  # Mirror *.po files into this dir.
+  # Usually contains *.s1 checksum files.
+  ref_po_dir="$po_dir/.reference"
+
+  test -d $ref_po_dir || mkdir $ref_po_dir || return
+  download_po_files $ref_po_dir $domain \
+    && ls "$ref_po_dir"/*.po 2>/dev/null |
+      sed 's|.*/||; s|\.po$||' > "$po_dir/LINGUAS" || return
+
+  for po in x $(ls $ref_po_dir | sed -n 's/\.po$//p'); do
+    case $po in x) continue;; esac
+    new_po="$ref_po_dir/$po.po"
+    cksum_file="$ref_po_dir/$po.s1"
+    if ! test -f "$cksum_file" ||
+        ! test -f "$po_dir/$po.po" ||
+        ! $SHA1SUM -c "$cksum_file" < "$new_po" > /dev/null 2>&1; then
+      echo "$me: updated $po_dir/$po.po..."
+      cp "$new_po" "$po_dir/$po.po" \
+          && $SHA1SUM < "$new_po" > "$cksum_file" || return
+    fi
+  done
+}
+
+# -------- Generate files automatically from existing sources.  --------------
+
+autogen_usage() {
+  cat <<EOF
+Usage: $me [OPTION]...
+Bootstrap this package from the checked-out sources, phase 2:
+Generate files from local files (no network access).
+
+Optional environment variables:
+  GNULIB_SRCDIR            Specifies the local directory where gnulib
+                           sources reside.  Use this if you already
+                           have gnulib sources on your machine, and
+                           you want to use these sources.
+
+Options:
+  --copy                   Copy files instead of creating symbolic links.
+  --force                  Attempt to bootstrap even if the sources seem
+                           not to have been checked out.
+EOF
+  bootstrap_print_option_usage_hook
+  cat <<EOF
+If the file bootstrap.conf exists in the same directory as this script, its
+contents are read as shell variables to configure the bootstrap.
+
+For build prerequisites, environment variables like \$AUTOCONF and \$AMTAR
+are honored.
+
+Gnulib sources are assumed to be present:
+  * in \$GNULIB_SRCDIR, if that environment variable is set,
+  * otherwise, in the 'gnulib' submodule, if such a submodule is configured,
+  * otherwise, in the 'gnulib' subdirectory.
+
+Running without arguments will suffice in most cases.
+EOF
+}
+
+
+version_controlled_file() {
+  parent=$1
+  file=$2
+  if test -d .git; then
+    git rm -n "$file" > /dev/null 2>&1
+  elif test -d .svn; then
+    svn log -r HEAD "$file" > /dev/null 2>&1
+  elif test -d CVS; then
+    grep -F "/${file##*/}/" "$parent/CVS/Entries" 2>/dev/null |
+             grep '^/[^/]*/[0-9]' > /dev/null
+  else
+    warn_ "no version control for $file?"
+    false
+  fi
+}
+
+# Strip blank and comment lines to leave significant entries.
+gitignore_entries() {
+  sed '/^#/d; /^$/d' "$@"
+}
+
+# If $STR is not already on a line by itself in $FILE, insert it at the start.
+# Entries are inserted at the start of the ignore list to ensure existing
+# entries starting with ! are not overridden.  Such entries support
+# whitelisting exceptions after a more generic blacklist pattern.
+insert_if_absent() {
+  file=$1
+  str=$2
+  test -f $file || touch $file
+  test -r $file || die "Error: failed to read ignore file: $file"
+  duplicate_entries=$(gitignore_entries $file | sort | uniq -d)
+  if [ "$duplicate_entries" ] ; then
+    die "Error: Duplicate entries in $file: " $duplicate_entries
+  fi
+  linesold=$(gitignore_entries $file | wc -l)
+  linesnew=$( { echo "$str"; cat $file; } | gitignore_entries | sort -u | wc -l)
+  if [ $linesold != $linesnew ] ; then
+    { echo "$str" | cat - $file > $file.bak && mv $file.bak $file; } \
+      || die "insert_if_absent $file $str: failed"
+  fi
+}
+
+# Adjust $PATTERN for $VC_IGNORE_FILE and insert it with
+# insert_if_absent.
+insert_vc_ignore() {
+  vc_ignore_file="$1"
+  pattern="$2"
+  case $vc_ignore_file in
+  *.gitignore)
+    # A .gitignore entry that does not start with '/' applies
+    # recursively to subdirectories, so prepend '/' to every
+    # .gitignore entry.
+    pattern=$(echo "$pattern" | sed s,^,/,);;
+  esac
+  insert_if_absent "$vc_ignore_file" "$pattern"
+}
+
+symlink_to_dir()
+{
+  src=$1/$2
+  dst=${3-$2}
+
+  test -f "$src" && {
+
+    # If the destination directory doesn't exist, create it.
+    # This is required at least for "lib/uniwidth/cjk.h".
+    dst_dir=$(dirname "$dst")
+    if ! test -d "$dst_dir"; then
+      mkdir -p "$dst_dir"
+
+      # If we've just created a directory like lib/uniwidth,
+      # tell version control system(s) it's ignorable.
+      # FIXME: for now, this does only one level
+      parent=$(dirname "$dst_dir")
+      for dot_ig in x $vc_ignore; do
+        test $dot_ig = x && continue
+        ig=$parent/$dot_ig
+        insert_vc_ignore $ig "${dst_dir##*/}/"
+      done
+    fi
+
+    if $copy; then
+      {
+        test ! -h "$dst" || {
+          echo "$me: rm -f $dst" &&
+          rm -f "$dst"
+        }
+      } &&
+      test -f "$dst" &&
+      cmp -s "$src" "$dst" || {
+        echo "$me: cp -fp $src $dst" &&
+        cp -fp "$src" "$dst"
+      }
+    else
+      # Leave any existing symlink alone, if it already points to the source,
+      # so that broken build tools that care about symlink times
+      # aren't confused into doing unnecessary builds.  Conversely, if the
+      # existing symlink's timestamp is older than the source, make it afresh,
+      # so that broken tools aren't confused into skipping needed builds.  See
+      # <https://lists.gnu.org/r/bug-gnulib/2011-05/msg00326.html>.
+      test -h "$dst" &&
+      src_ls=$(ls -diL "$src" 2>/dev/null) && set $src_ls && src_i=$1 &&
+      dst_ls=$(ls -diL "$dst" 2>/dev/null) && set $dst_ls && dst_i=$1 &&
+      test "$src_i" = "$dst_i" &&
+      both_ls=$(ls -dt "$src" "$dst") &&
+      test "X$both_ls" = "X$dst$nl$src" || {
+        dot_dots=
+        case $src in
+        /*) ;;
+        *)
+          case /$dst/ in
+          *//* | */../* | */./* | /*/*/*/*/*/)
+             die "invalid symlink calculation: $src -> $dst";;
+          /*/*/*/*/)    dot_dots=../../../;;
+          /*/*/*/)      dot_dots=../../;;
+          /*/*/)        dot_dots=../;;
+          esac;;
+        esac
+
+        echo "$me: ln -fs $dot_dots$src $dst" &&
+        ln -fs "$dot_dots$src" "$dst"
+      }
+    fi
+  }
+}
+
+# Regenerate all autogeneratable files that are omitted from the
+# version control repository.  In particular, regenerate all
+# aclocal.m4, config.h.in, Makefile.in, configure files with new
+# versions of autoconf or automake.
+autogen()
+{
+  # Ensure that CDPATH is not set.  Otherwise, the output from cd
+  # would cause trouble in at least one use below.
+  (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+  # Environment variables that may be set by the user.
+  : "${AUTOPOINT=autopoint}"
+  : "${AUTORECONF=autoreconf}"
+
+  if test "$vc_ignore" = auto; then
+    vc_ignore=
+    test -d .git && vc_ignore=.gitignore
+    test -d CVS && vc_ignore="$vc_ignore .cvsignore"
+  fi
+
+
+  # Parse options.
+
+  # Whether to use copies instead of symlinks.
+  copy=false
+
+  for option
+  do
+    case $option in
+    --help)
+      autogen_usage
+      return;;
+    --version)
+      set -e
+      echo "autogen.sh $scriptlibversion"
+      echo "$copyright"
+      return 0
+      ;;
+    --force)
+      checkout_only_file=;;
+    --copy)
+      copy=true;;
+    *)
+      bootstrap_option_hook $option || die "$option: unknown option";;
+    esac
+  done
+
+  test -z "$GNULIB_SRCDIR" || test -d "$GNULIB_SRCDIR" \
+    || die "Error: \$GNULIB_SRCDIR environment variable or --gnulib-srcdir" \
+           "option is specified, but does not denote a directory"
+
+  if test -n "$checkout_only_file" && test ! -r "$checkout_only_file"; then
+    die "Running this script from a non-checked-out distribution is risky."
+  fi
+
+  if $use_gnulib; then
+    if test -z "$GNULIB_SRCDIR"; then
+      gnulib_path=$(test -f .gitmodules &&
+                    git config --file .gitmodules submodule.gnulib.path)
+      test -z "$gnulib_path" && gnulib_path=gnulib
+      GNULIB_SRCDIR=$gnulib_path
+    fi
+  fi
+
+  # Die if there is no AC_CONFIG_AUX_DIR($build_aux) line in configure.ac.
+  found_aux_dir=no
+  grep '^[	 ]*AC_CONFIG_AUX_DIR(\['"$build_aux"'])' configure.ac \
+      >/dev/null && found_aux_dir=yes
+  grep '^[	 ]*AC_CONFIG_AUX_DIR('"$build_aux"')' configure.ac \
+      >/dev/null && found_aux_dir=yes
+  test $found_aux_dir = yes \
+    || die "configure.ac lacks 'AC_CONFIG_AUX_DIR([$build_aux])'; add it"
+
+  # If $build_aux doesn't exist, create it now, otherwise some bits
+  # below will malfunction.  If creating it, also mark it as ignored.
+  if test ! -d $build_aux; then
+    mkdir $build_aux
+    for dot_ig in x $vc_ignore; do
+      test $dot_ig = x && continue
+      insert_vc_ignore $dot_ig $build_aux/
+    done
+  fi
+
+  check_build_prerequisites false
+
+  use_libtool=0
+  # We'd like to use grep -E, to see if any of LT_INIT,
+  # AC_PROG_LIBTOOL, AM_PROG_LIBTOOL is used in configure.ac,
+  # but that's not portable enough (e.g., for Solaris).
+  grep '^[	 ]*A[CM]_PROG_LIBTOOL' configure.ac >/dev/null \
+    && use_libtool=1
+  grep '^[	 ]*LT_INIT' configure.ac >/dev/null \
+    && use_libtool=1
+  if test $use_libtool = 1; then
+    find_tool LIBTOOLIZE glibtoolize libtoolize
+  fi
+
+  if $use_gnulib; then
+    gnulib_tool=$GNULIB_SRCDIR/gnulib-tool
+    <$gnulib_tool || return
+  fi
+
+  # NOTE: we have to be careful to run both autopoint and libtoolize
+  # before gnulib-tool, since gnulib-tool is likely to provide newer
+  # versions of files "installed" by these two programs.
+  # Then, *after* gnulib-tool (see below), we have to be careful to
+  # run autoreconf in such a way that it does not run either of these
+  # two just-pre-run programs.
+
+  # Import from gettext.
+  with_gettext=yes
+  grep '^[	 ]*AM_GNU_GETTEXT_VERSION(' configure.ac >/dev/null || \
+      with_gettext=no
+
+  if test $with_gettext = yes || test $use_libtool = 1; then
+
+    tempbase=.bootstrap$$
+    trap "rm -f $tempbase.0 $tempbase.1" HUP INT PIPE TERM
+
+    > $tempbase.0 > $tempbase.1 &&
+    find . ! -type d -print | sort > $tempbase.0 || return
+
+    if test $with_gettext = yes; then
+      # Released autopoint has the tendency to install macros that have been
+      # obsoleted in current gnulib, so run this before gnulib-tool.
+      echo "$0: $AUTOPOINT --force"
+      $AUTOPOINT --force || return
+    fi
+
+    # Autoreconf runs aclocal before libtoolize, which causes spurious
+    # warnings if the initial aclocal is confused by the libtoolized
+    # (or worse out-of-date) macro directory.
+    # libtoolize 1.9b added the --install option; but we support back
+    # to libtoolize 1.5.22, where the install action was default.
+    if test $use_libtool = 1; then
+      install=
+      case $($LIBTOOLIZE --help) in
+        *--install*) install=--install ;;
+      esac
+      echo "running: $LIBTOOLIZE $install --copy"
+      $LIBTOOLIZE $install --copy
+    fi
+
+    find . ! -type d -print | sort >$tempbase.1
+    old_IFS=$IFS
+    IFS=$nl
+    for file in $(comm -13 $tempbase.0 $tempbase.1); do
+      IFS=$old_IFS
+      parent=${file%/*}
+      version_controlled_file "$parent" "$file" || {
+        for dot_ig in x $vc_ignore; do
+          test $dot_ig = x && continue
+          ig=$parent/$dot_ig
+          insert_vc_ignore "$ig" "${file##*/}"
+        done
+      }
+    done
+    IFS=$old_IFS
+
+    rm -f $tempbase.0 $tempbase.1
+    trap - HUP INT PIPE TERM
+  fi
+
+  # Import from gnulib.
+
+  if $use_gnulib; then
+    gnulib_tool_options="\
+     --no-changelog\
+     --aux-dir=$build_aux\
+     --doc-base=$doc_base\
+     --lib=$gnulib_name\
+     --m4-base=$m4_base/\
+     --source-base=$source_base/\
+     --tests-base=$tests_base\
+     --local-dir=$local_gl_dir\
+     $gnulib_tool_option_extras\
+    "
+    if test $use_libtool = 1; then
+      case "$gnulib_tool_options " in
+        *' --libtool '*) ;;
+        *) gnulib_tool_options="$gnulib_tool_options --libtool" ;;
+      esac
+    fi
+    echo "$0: $gnulib_tool $gnulib_tool_options --import ..."
+    $gnulib_tool $gnulib_tool_options --import $gnulib_modules \
+      || die "gnulib-tool failed"
+
+    if test $with_gettext = yes && test ! -f $m4_base/gettext.m4; then
+      # The gnulib-tool invocation has removed $m4_base/gettext.m4, that the
+      # AUTOPOINT invocation had installed. This can occur when the gnulib
+      # module 'gettext' was previously present but is now not present any more.
+      # Repeat the AUTOPOINT invocation and the gnulib-tool invocation.
+
+      echo "$0: $AUTOPOINT --force"
+      $AUTOPOINT --force || return
+
+      echo "$0: $gnulib_tool $gnulib_tool_options --import ..."
+      $gnulib_tool $gnulib_tool_options --import $gnulib_modules \
+        || die "gnulib-tool failed"
+    fi
+
+    for file in $gnulib_files; do
+      symlink_to_dir "$GNULIB_SRCDIR" $file \
+        || die "failed to symlink $file"
+    done
+  fi
+
+  bootstrap_post_import_hook \
+    || die "bootstrap_post_import_hook failed"
+
+  # Remove any dangling symlink matching "*.m4" or "*.[ch]" in some
+  # gnulib-populated directories.  Such .m4 files would cause aclocal to fail.
+  # The following requires GNU find 4.2.3 or newer.  Considering the usual
+  # portability constraints of this script, that may seem a very demanding
+  # requirement, but it should be ok.  Ignore any failure, which is fine,
+  # since this is only a convenience to help developers avoid the relatively
+  # unusual case in which a symlinked-to .m4 file is git-removed from gnulib
+  # between successive runs of this script.
+  find "$m4_base" "$source_base" \
+    -depth \( -name '*.m4' -o -name '*.[ch]' \) \
+    -type l -xtype l -delete > /dev/null 2>&1
+
+  # Invoke autoreconf with --force --install to ensure upgrades of tools
+  # such as ylwrap.
+  AUTORECONFFLAGS="--verbose --install --force $ACLOCAL_FLAGS"
+  AUTORECONFFLAGS="$AUTORECONFFLAGS --no-recursive"
+
+  # Tell autoreconf not to invoke autopoint or libtoolize; they were run above.
+  echo "running: AUTOPOINT=true LIBTOOLIZE=true $AUTORECONF $AUTORECONFFLAGS"
+  AUTOPOINT=true LIBTOOLIZE=true $AUTORECONF $AUTORECONFFLAGS \
+    || die "autoreconf failed"
+
+  # Get some extra files from gnulib, overriding existing files.
+  for file in $gnulib_extra_files; do
+    case $file in
+      */INSTALL) dst=INSTALL;;
+      build-aux/*) dst=$build_aux/${file#build-aux/};;
+      *) dst=$file;;
+    esac
+    symlink_to_dir "$GNULIB_SRCDIR" $file $dst \
+      || die "failed to symlink $file"
+  done
+
+  if test $with_gettext = yes; then
+    # Create gettext configuration.
+    echo "$0: Creating po/Makevars from po/Makevars.template ..."
+    rm -f po/Makevars
+    sed '
+      /^EXTRA_LOCALE_CATEGORIES *=/s/=.*/= '"$EXTRA_LOCALE_CATEGORIES"'/
+      /^COPYRIGHT_HOLDER *=/s/=.*/= '"$COPYRIGHT_HOLDER"'/
+      /^MSGID_BUGS_ADDRESS *=/s|=.*|= '"$MSGID_BUGS_ADDRESS"'|
+      /^XGETTEXT_OPTIONS *=/{
+        s/$/ \\/
+        a\
+            '"$XGETTEXT_OPTIONS"' $${end_of_xgettext_options+}
+      }
+    ' po/Makevars.template >po/Makevars \
+      || die 'cannot generate po/Makevars'
+
+    # If the 'gettext' module is in use, grab the latest Makefile.in.in.
+    # If only the 'gettext-h' module is in use, assume autopoint already
+    # put the correct version of this file into place.
+    case $gnulib_modules in
+      *gettext-h*) ;;
+      *gettext*)
+        cp $GNULIB_SRCDIR/build-aux/po/Makefile.in.in po/Makefile.in.in \
+          || die "cannot create po/Makefile.in.in"
+        ;;
+    esac
+
+    if test -d runtime-po; then
+      # Similarly for runtime-po/Makevars, but not quite the same.
+      rm -f runtime-po/Makevars
+      sed '
+        /^DOMAIN *=.*/s/=.*/= '"$package"'-runtime/
+        /^subdir *=.*/s/=.*/= runtime-po/
+        /^MSGID_BUGS_ADDRESS *=/s/=.*/= bug-'"$package"'@gnu.org/
+        /^XGETTEXT_OPTIONS *=/{
+          s/$/ \\/
+          a\
+              '"$XGETTEXT_OPTIONS_RUNTIME"' $${end_of_xgettext_options+}
+        }
+      ' po/Makevars.template >runtime-po/Makevars \
+      || die 'cannot generate runtime-po/Makevars'
+
+      # Copy identical files from po to runtime-po.
+      cp -p po/Makefile.in.in po/*-quot po/*.header po/*.sed po/*.sin runtime-po
+    fi
+  fi
+
+  bootstrap_epilogue
+
+  echo "$0: done.  Now you can run './configure'."
+}
+
 # ----------------------------------------------------------------------------
 
 # Local Variables:
-# eval: (add-hook 'before-save-hook 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
+# eval: (add-hook 'before-save-hook 'time-stamp nil t)
+# time-stamp-start: "scriptlibversion="
+# time-stamp-format: "%Y-%02m-%02d.%02H"
 # time-stamp-time-zone: "UTC0"
 # time-stamp-end: "; # UTC"
 # End:
diff --git a/bootstrap.conf b/bootstrap.conf
index fbe894221..03c518a7b 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -1,6 +1,7 @@
 # Bootstrap configuration.
 
-# Copyright (C) 2006-2015, 2018-2022 Free Software Foundation, Inc.
+# Copyright (C) 2006-2015, 2018-2022, 2025-2026 Free Software
+# Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -81,6 +82,10 @@ XGETTEXT_OPTIONS_RUNTIME=$XGETTEXT_OPTIONS'\\\
 
 gnulib_tool_option_extras='--symlink --conditional-dependencies --makefile-name=gnulib.mk --automake-subdir --automake-subdir-tests --po-base=gnulib-po --po-domain=bison'
 
+gnulib_extra_files="$gnulib_extra_files build-aux/move-if-change"
+
+gnulib_extra_files="$gnulib_extra_files build-aux/epsf.tex"
+
 bootstrap_post_import_hook()
 {
   # Ensure that ChangeLog exists, for automake.
diff --git a/build-aux/.gitignore b/build-aux/.gitignore
index 2e9d5037f..d3a1fa967 100644
--- a/build-aux/.gitignore
+++ b/build-aux/.gitignore
@@ -7,6 +7,7 @@
 /config.sub
 /depcomp
 /do-release-commit-and-tag
+/epsf.tex
 /gendocs.sh
 /git-version-gen
 /gitlog-to-changelog
diff --git a/build-aux/Darwin.valgrind b/build-aux/Darwin.valgrind
index 1dc24f906..82e0257e5 100644
--- a/build-aux/Darwin.valgrind
+++ b/build-aux/Darwin.valgrind
@@ -1,4 +1,5 @@
-# Copyright (C) 2012-2015, 2018-2022 Free Software Foundation, Inc.
+# Copyright (C) 2012-2015, 2018-2022, 2025-2026 Free Software
+# Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/build-aux/Linux.valgrind b/build-aux/Linux.valgrind
index 7400a4337..0781848c7 100644
--- a/build-aux/Linux.valgrind
+++ b/build-aux/Linux.valgrind
@@ -1,4 +1,5 @@
-# Copyright (C) 2012-2015, 2018-2022 Free Software Foundation, Inc.
+# Copyright (C) 2012-2015, 2018-2022, 2025-2026 Free Software
+# Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/build-aux/cross-options.pl b/build-aux/cross-options.pl
index 87434841b..b7bb91f3c 100755
--- a/build-aux/cross-options.pl
+++ b/build-aux/cross-options.pl
@@ -2,7 +2,7 @@
 
 # Generate a release announcement message.
 
-# Copyright (C) 2007-2022 Free Software Foundation, Inc.
+# Copyright (C) 2007-2022, 2025-2026 Free Software Foundation, Inc.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/build-aux/local.mk b/build-aux/local.mk
index ee0e33fcd..8c8cf2e43 100644
--- a/build-aux/local.mk
+++ b/build-aux/local.mk
@@ -1,4 +1,5 @@
-## Copyright (C) 2000-2015, 2018-2022 Free Software Foundation, Inc.
+## Copyright (C) 2000-2015, 2018-2022, 2025-2026 Free Software
+## Foundation, Inc.
 ##
 ## This program is free software: you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -17,6 +18,7 @@ EXTRA_DIST +=					\
   build-aux/Darwin.valgrind			\
   build-aux/Linux.valgrind			\
   build-aux/cross-options.pl			\
+  build-aux/epsf.tex				\
   build-aux/move-if-change			\
   build-aux/prev-version.txt			\
   build-aux/update-b4-copyright
diff --git a/build-aux/move-if-change b/build-aux/move-if-change
deleted file mode 120000
index 2df61a60a..000000000
--- a/build-aux/move-if-change
+++ /dev/null
@@ -1 +0,0 @@
-../gnulib/build-aux/move-if-change
\ No newline at end of file
diff --git a/build-aux/update-b4-copyright b/build-aux/update-b4-copyright
index 43d6f0ee3..c024078de 100755
--- a/build-aux/update-b4-copyright
+++ b/build-aux/update-b4-copyright
@@ -3,7 +3,8 @@
 # Update b4_copyright invocations or b4_copyright_years definitions to
 # include the current year.
 
-# Copyright (C) 2009-2015, 2018-2022 Free Software Foundation, Inc.
+# Copyright (C) 2009-2015, 2018-2022, 2025-2026 Free Software
+# Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/build-aux/update-package-copyright-year b/build-aux/update-package-copyright-year
index cb8ea3523..78dd83647 100755
--- a/build-aux/update-package-copyright-year
+++ b/build-aux/update-package-copyright-year
@@ -2,7 +2,8 @@
 
 # In configure.ac, update PACKAGE_COPYRIGHT_YEAR to the current year.
 
-# Copyright (C) 2010-2015, 2018-2022 Free Software Foundation, Inc.
+# Copyright (C) 2010-2015, 2018-2022, 2025-2026 Free Software
+# Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/build-aux/update-test b/build-aux/update-test
index 11e925321..b576edbc0 100755
--- a/build-aux/update-test
+++ b/build-aux/update-test
@@ -2,7 +2,7 @@
 
 # Update expectations in an Autotest test suite.
 
-# Copyright (C) 2019-2022 Free Software Foundation, Inc.
+# Copyright (C) 2019-2022, 2025-2026 Free Software Foundation, Inc.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/cfg.mk b/cfg.mk
index ad5807621..031bf36e9 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -1,5 +1,6 @@
 ## Customize maint.mk                           -*- makefile -*-
-## Copyright (C) 2008-2015, 2018-2022 Free Software Foundation, Inc.
+## Copyright (C) 2008-2015, 2018-2022, 2025-2026 Free Software
+## Foundation, Inc.
 
 ## This program is free software: you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
diff --git a/configure.ac b/configure.ac
index 442874d6b..ef742e9c8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,7 @@
 # Configure template for GNU Bison.                   -*-Autoconf-*-
 #
-# Copyright (C) 2001-2015, 2018-2022 Free Software Foundation, Inc.
+# Copyright (C) 2001-2015, 2018-2022, 2025-2026 Free Software
+# Foundation, Inc.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -24,7 +25,7 @@ AC_INIT([GNU Bison],
         [bug-bison@gnu.org],
         [],
         [https://www.gnu.org/software/bison/])
-AC_SUBST([PACKAGE_COPYRIGHT_YEAR], [2022])
+AC_SUBST([PACKAGE_COPYRIGHT_YEAR], [2026])
 AC_DEFINE_UNQUOTED([PACKAGE_COPYRIGHT_YEAR], [$PACKAGE_COPYRIGHT_YEAR],
                    [The copyright year for this package])
 
diff --git a/data/README.md b/data/README.md
index dea32d2d5..fd5eda2d9 100644
--- a/data/README.md
+++ b/data/README.md
@@ -207,7 +207,8 @@ fill-column: 76
 ispell-dictionary: "american"
 End:
 
-Copyright (C) 2002, 2008-2015, 2018-2022 Free Software Foundation, Inc.
+Copyright (C) 2002, 2008-2015, 2018-2022, 2025-2026 Free Software
+Foundation, Inc.
 
 This file is part of GNU Bison.
 
diff --git a/data/bison-default.css b/data/bison-default.css
index 70932172b..f956223af 100644
--- a/data/bison-default.css
+++ b/data/bison-default.css
@@ -1,5 +1,5 @@
 /* Default styling rules for Bison when doing terminal output.
-   Copyright (C) 2019-2022 Free Software Foundation, Inc.
+   Copyright (C) 2019-2022, 2025-2026 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/data/local.mk b/data/local.mk
index 3f5bc68e0..cea6433e0 100644
--- a/data/local.mk
+++ b/data/local.mk
@@ -1,5 +1,5 @@
-## Copyright (C) 2002, 2005-2015, 2018-2022 Free Software Foundation,
-## Inc.
+## Copyright (C) 2002, 2005-2015, 2018-2022, 2025-2026 Free Software
+## Foundation, Inc.
 
 ## This program is free software: you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
diff --git a/data/skeletons/bison.m4 b/data/skeletons/bison.m4
index 22e6abe68..762f140c9 100644
--- a/data/skeletons/bison.m4
+++ b/data/skeletons/bison.m4
@@ -2,8 +2,8 @@
 
 # Language-independent M4 Macros for Bison.
 
-# Copyright (C) 2002, 2004-2015, 2018-2022 Free Software Foundation,
-# Inc.
+# Copyright (C) 2002, 2004-2015, 2018-2022, 2025-2026 Free Software
+# Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/data/skeletons/c++-skel.m4 b/data/skeletons/c++-skel.m4
index 3ff1d551d..84577c08c 100644
--- a/data/skeletons/c++-skel.m4
+++ b/data/skeletons/c++-skel.m4
@@ -2,7 +2,7 @@
 
 # C++ skeleton dispatching for Bison.
 
-# Copyright (C) 2006-2007, 2009-2015, 2018-2022 Free Software
+# Copyright (C) 2006-2007, 2009-2015, 2018-2022, 2025-2026 Free Software
 # Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
diff --git a/data/skeletons/c++.m4 b/data/skeletons/c++.m4
index d63d15480..b55f77629 100644
--- a/data/skeletons/c++.m4
+++ b/data/skeletons/c++.m4
@@ -2,7 +2,7 @@
 
 # C++ skeleton for Bison
 
-# Copyright (C) 2002-2022 Free Software Foundation, Inc.
+# Copyright (C) 2002-2022, 2025-2026 Free Software Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/data/skeletons/c-like.m4 b/data/skeletons/c-like.m4
index 79a761f71..25a241b59 100644
--- a/data/skeletons/c-like.m4
+++ b/data/skeletons/c-like.m4
@@ -2,7 +2,8 @@
 
 # Common code for C-like languages (C, C++, Java, etc.)
 
-# Copyright (C) 2012-2015, 2018-2022 Free Software Foundation, Inc.
+# Copyright (C) 2012-2015, 2018-2022, 2025-2026 Free Software
+# Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/data/skeletons/c-skel.m4 b/data/skeletons/c-skel.m4
index a3315f2ba..b145cc1b2 100644
--- a/data/skeletons/c-skel.m4
+++ b/data/skeletons/c-skel.m4
@@ -2,7 +2,7 @@
 
 # C skeleton dispatching for Bison.
 
-# Copyright (C) 2006-2007, 2009-2015, 2018-2022 Free Software
+# Copyright (C) 2006-2007, 2009-2015, 2018-2022, 2025-2026 Free Software
 # Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
diff --git a/data/skeletons/c.m4 b/data/skeletons/c.m4
index 6f90ebe8f..898ee1ccb 100644
--- a/data/skeletons/c.m4
+++ b/data/skeletons/c.m4
@@ -2,8 +2,8 @@
 
 # C M4 Macros for Bison.
 
-# Copyright (C) 2002, 2004-2015, 2018-2022 Free Software Foundation,
-# Inc.
+# Copyright (C) 2002, 2004-2015, 2018-2022, 2025-2026 Free Software
+# Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/data/skeletons/d-skel.m4 b/data/skeletons/d-skel.m4
index 436ec1dd0..8580fed5c 100644
--- a/data/skeletons/d-skel.m4
+++ b/data/skeletons/d-skel.m4
@@ -2,7 +2,7 @@
 
 # D skeleton dispatching for Bison.
 
-# Copyright (C) 2018-2022 Free Software Foundation, Inc.
+# Copyright (C) 2018-2022, 2025-2026 Free Software Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/data/skeletons/d.m4 b/data/skeletons/d.m4
index e82f87e5d..673a0f29f 100644
--- a/data/skeletons/d.m4
+++ b/data/skeletons/d.m4
@@ -2,7 +2,7 @@
 
 # D language support for Bison
 
-# Copyright (C) 2018-2022 Free Software Foundation, Inc.
+# Copyright (C) 2018-2022, 2025-2026 Free Software Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/data/skeletons/glr.c b/data/skeletons/glr.c
index fd654140a..bac830856 100644
--- a/data/skeletons/glr.c
+++ b/data/skeletons/glr.c
@@ -2,7 +2,8 @@
 
 # GLR skeleton for Bison
 
-# Copyright (C) 2002-2015, 2018-2022 Free Software Foundation, Inc.
+# Copyright (C) 2002-2015, 2018-2022, 2025-2026 Free Software
+# Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -199,7 +200,7 @@ b4_glr_cc_if([],
 [b4_header_if(
 [b4_output_begin([b4_spec_header_file])
 b4_copyright([Skeleton interface for Bison GLR parsers in C],
-             [2002-2015, 2018-2022])[
+             [2002-2015, 2018-2022, 2025-2026])[
 ]b4_cpp_guard_open([b4_spec_mapped_header_file])[
 ]b4_shared_declarations[
 ]b4_cpp_guard_close([b4_spec_mapped_header_file])[
@@ -213,7 +214,7 @@ b4_copyright([Skeleton interface for Bison GLR parsers in C],
 
 b4_output_begin([b4_parser_file_name])
 b4_copyright([Skeleton implementation for Bison GLR parsers in C],
-             [2002-2015, 2018-2022])[
+             [2002-2015, 2018-2022, 2025-2026])[
 /* C GLR parser skeleton written by Paul Hilfinger.  */
 
 ]b4_disclaimer[
diff --git a/data/skeletons/glr.cc b/data/skeletons/glr.cc
index e31083f8d..bd6efb14c 100644
--- a/data/skeletons/glr.cc
+++ b/data/skeletons/glr.cc
@@ -1,6 +1,7 @@
 # C++ GLR skeleton for Bison
 
-# Copyright (C) 2002-2015, 2018-2022 Free Software Foundation, Inc.
+# Copyright (C) 2002-2015, 2018-2022, 2025-2026 Free Software
+# Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -381,7 +382,7 @@ b4_percent_code_get([[requires]])[
 ]b4_header_if(
 [b4_output_begin([b4_spec_header_file])
 b4_copyright([Skeleton interface for Bison GLR parsers in C++],
-             [2002-2015, 2018-2022])[
+             [2002-2015, 2018-2022, 2025-2026])[
 // C++ GLR parser skeleton written by Akim Demaille.
 
 ]b4_disclaimer[
diff --git a/data/skeletons/glr2.cc b/data/skeletons/glr2.cc
index 970ccfdf1..3ec734da9 100644
--- a/data/skeletons/glr2.cc
+++ b/data/skeletons/glr2.cc
@@ -1,6 +1,7 @@
 # C++ GLR skeleton for Bison
 
-# Copyright (C) 2002-2015, 2018-2022 Free Software Foundation, Inc.
+# Copyright (C) 2002-2015, 2018-2022, 2025-2026 Free Software
+# Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/data/skeletons/java-skel.m4 b/data/skeletons/java-skel.m4
index cde220506..0af07ad48 100644
--- a/data/skeletons/java-skel.m4
+++ b/data/skeletons/java-skel.m4
@@ -2,8 +2,8 @@
 
 # Java skeleton dispatching for Bison.
 
-# Copyright (C) 2007, 2009-2015, 2018-2022 Free Software Foundation,
-# Inc.
+# Copyright (C) 2007, 2009-2015, 2018-2022, 2025-2026 Free Software
+# Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/data/skeletons/java.m4 b/data/skeletons/java.m4
index e6bafb8cc..21b016ddd 100644
--- a/data/skeletons/java.m4
+++ b/data/skeletons/java.m4
@@ -2,7 +2,8 @@
 
 # Java language support for Bison
 
-# Copyright (C) 2007-2015, 2018-2022 Free Software Foundation, Inc.
+# Copyright (C) 2007-2015, 2018-2022, 2025-2026 Free Software
+# Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/data/skeletons/lalr1.cc b/data/skeletons/lalr1.cc
index 4242b992d..11dcd37e6 100644
--- a/data/skeletons/lalr1.cc
+++ b/data/skeletons/lalr1.cc
@@ -1,6 +1,7 @@
 # C++ skeleton for Bison
 
-# Copyright (C) 2002-2015, 2018-2022 Free Software Foundation, Inc.
+# Copyright (C) 2002-2015, 2018-2022, 2025-2026 Free Software
+# Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -159,7 +160,7 @@ m4_ifdef([b4_lex_param], [, ]b4_lex_param))])])
 
 
 m4_pushdef([b4_copyright_years],
-           [2002-2015, 2018-2022])
+           [2002-2015, 2018-2022, 2025-2026])
 
 m4_define([b4_parser_class],
           [b4_percent_define_get([[api.parser.class]])])
@@ -986,6 +987,7 @@ b4_dollar_popdef])[]dnl
   yyreduce:
     yylen = yyr2_[yyn];
     {
+      YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
       stack_symbol_type yylhs;
       yylhs.state = yy_lr_goto_state_ (yystack_[yylen].state, yyr1_[yyn]);]b4_variant_if([[
       /* Variants are always initialized to an empty instance of the
@@ -1038,6 +1040,7 @@ b4_dollar_popdef])[]dnl
 
       // Shift the result of the reduction.
       yypush_ (YY_NULLPTR, YY_MOVE (yylhs));
+      YY_IGNORE_MAYBE_UNINITIALIZED_END
     }
     goto yynewstate;
 
diff --git a/data/skeletons/lalr1.d b/data/skeletons/lalr1.d
index 011753250..28762ebcd 100644
--- a/data/skeletons/lalr1.d
+++ b/data/skeletons/lalr1.d
@@ -1,6 +1,7 @@
 # D skeleton for Bison -*- autoconf -*-
 
-# Copyright (C) 2007-2012, 2019-2022 Free Software Foundation, Inc.
+# Copyright (C) 2007-2012, 2019-2022, 2025-2026 Free Software
+# Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -61,7 +62,7 @@ b4_use_push_for_pull_if([
 # or as class instance variable when doing push parsing.
 b4_output_begin([b4_parser_file_name])
 b4_copyright([Skeleton implementation for Bison LALR(1) parsers in D],
-             [2007-2012, 2019-2022])[
+             [2007-2012, 2019-2022, 2025-2026])[
 ]b4_disclaimer[
 ]b4_percent_define_ifdef([package], [module b4_percent_define_get([package]);
 ])[
diff --git a/data/skeletons/lalr1.java b/data/skeletons/lalr1.java
index 11a46873d..bf060e5ee 100644
--- a/data/skeletons/lalr1.java
+++ b/data/skeletons/lalr1.java
@@ -1,6 +1,7 @@
 # Java skeleton for Bison                           -*- java -*-
 
-# Copyright (C) 2007-2015, 2018-2022 Free Software Foundation, Inc.
+# Copyright (C) 2007-2015, 2018-2022, 2025-2026 Free Software
+# Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/data/skeletons/location.cc b/data/skeletons/location.cc
index 091a95b1a..07d0f9c1c 100644
--- a/data/skeletons/location.cc
+++ b/data/skeletons/location.cc
@@ -1,6 +1,7 @@
 # C++ skeleton for Bison
 
-# Copyright (C) 2002-2015, 2018-2022 Free Software Foundation, Inc.
+# Copyright (C) 2002-2015, 2018-2022, 2025-2026 Free Software
+# Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -16,7 +17,7 @@
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 m4_pushdef([b4_copyright_years],
-           [2002-2015, 2018-2022])
+           [2002-2015, 2018-2022, 2025-2026])
 
 
 # b4_location_file
diff --git a/data/skeletons/stack.hh b/data/skeletons/stack.hh
index 552910a22..08446e00c 100644
--- a/data/skeletons/stack.hh
+++ b/data/skeletons/stack.hh
@@ -1,6 +1,7 @@
 # C++ skeleton for Bison
 
-# Copyright (C) 2002-2015, 2018-2022 Free Software Foundation, Inc.
+# Copyright (C) 2002-2015, 2018-2022, 2025-2026 Free Software
+# Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/data/skeletons/variant.hh b/data/skeletons/variant.hh
index 98a0b3c9e..4306f04ff 100644
--- a/data/skeletons/variant.hh
+++ b/data/skeletons/variant.hh
@@ -1,6 +1,7 @@
 # C++ skeleton for Bison
 
-# Copyright (C) 2002-2015, 2018-2022 Free Software Foundation, Inc.
+# Copyright (C) 2002-2015, 2018-2022, 2025-2026 Free Software
+# Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/data/skeletons/yacc.c b/data/skeletons/yacc.c
index 07a523b0a..1172e2e87 100644
--- a/data/skeletons/yacc.c
+++ b/data/skeletons/yacc.c
@@ -1,11 +1,11 @@
 #                                                            -*- C -*-
 # Yacc compatible skeleton for Bison
 
-# Copyright (C) 1984, 1989-1990, 2000-2015, 2018-2022 Free Software
-# Foundation, Inc.
+# Copyright (C) 1984, 1989-1990, 2000-2015, 2018-2022, 2025-2026 Free
+# Software Foundation, Inc.
 
 m4_pushdef([b4_copyright_years],
-           [1984, 1989-1990, 2000-2015, 2018-2022])
+           [1984, 1989-1990, 2000-2015, 2018-2022, 2025-2026])
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -1531,9 +1531,11 @@ yypull_parse (yypstate *yyps]b4_user_formals[)
   YYLTYPE yylloc = yyloc_default;]])])[
   int yystatus;
   do {
-]b4_pure_if([[    YYSTYPE yylval;
+]b4_pure_if([[    YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
+    YYSTYPE yylval;
     int ]])[yychar = ]b4_yylex[;
-    yystatus = yypush_parse (yyps]b4_pure_if([[, yychar, &yylval]b4_locations_if([[, &yylloc]])])m4_ifset([b4_parse_param], [, b4_args(b4_parse_param)])[);
+    yystatus = yypush_parse (yyps]b4_pure_if([[, yychar, &yylval]b4_locations_if([[, &yylloc]])])m4_ifset([b4_parse_param], [, b4_args(b4_parse_param)])[);]b4_pure_if([[
+    YY_IGNORE_MAYBE_UNINITIALIZED_END]])[
   } while (yystatus == YYPUSH_MORE);
   return yystatus;
 }]])[
diff --git a/data/xslt/bison.xsl b/data/xslt/bison.xsl
index 7599f13c6..0be3a352c 100644
--- a/data/xslt/bison.xsl
+++ b/data/xslt/bison.xsl
@@ -3,7 +3,8 @@
 <!--
     bison.xsl - common templates for Bison XSLT.
 
-    Copyright (C) 2007-2015, 2018-2022 Free Software Foundation, Inc.
+    Copyright (C) 2007-2015, 2018-2022, 2025-2026 Free Software
+    Foundation, Inc.
 
     This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/data/xslt/xml2dot.xsl b/data/xslt/xml2dot.xsl
index 8d99ed17b..198b973b1 100644
--- a/data/xslt/xml2dot.xsl
+++ b/data/xslt/xml2dot.xsl
@@ -3,7 +3,8 @@
 <!--
     xml2dot.xsl - transform Bison XML Report into DOT.
 
-    Copyright (C) 2007-2015, 2018-2022 Free Software Foundation, Inc.
+    Copyright (C) 2007-2015, 2018-2022, 2025-2026 Free Software
+    Foundation, Inc.
 
     This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/data/xslt/xml2text.xsl b/data/xslt/xml2text.xsl
index 62d5fd453..d1834fe03 100644
--- a/data/xslt/xml2text.xsl
+++ b/data/xslt/xml2text.xsl
@@ -3,7 +3,8 @@
 <!--
     xml2text.xsl - transform Bison XML Report into plain text.
 
-    Copyright (C) 2007-2015, 2018-2022 Free Software Foundation, Inc.
+    Copyright (C) 2007-2015, 2018-2022, 2025-2026 Free Software
+    Foundation, Inc.
 
     This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/data/xslt/xml2xhtml.xsl b/data/xslt/xml2xhtml.xsl
index f608a2550..b90f0528b 100644
--- a/data/xslt/xml2xhtml.xsl
+++ b/data/xslt/xml2xhtml.xsl
@@ -3,7 +3,8 @@
 <!--
     xml2html.xsl - transform Bison XML Report into XHTML.
 
-    Copyright (C) 2007-2015, 2018-2022 Free Software Foundation, Inc.
+    Copyright (C) 2007-2015, 2018-2022, 2025-2026 Free Software
+    Foundation, Inc.
 
     This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/doc/bison.texi b/doc/bison.texi
index 5ffe21d02..a72fdd6d0 100644
--- a/doc/bison.texi
+++ b/doc/bison.texi
@@ -173,8 +173,8 @@
 This manual (@value{UPDATED}) is for GNU Bison (version @value{VERSION}),
 the GNU parser generator.
 
-Copyright @copyright{} 1988--1993, 1995, 1998--2015, 2018--2022 Free
-Software Foundation, Inc.
+Copyright @copyright{} 1988--1993, 1995, 1998--2015, 2018--2022,
+2025--2026 Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document under
@@ -1736,8 +1736,8 @@ after @samp{//}.
 @example
 /* Parser for rpcalc.   -*- C -*-
 
-   Copyright (C) 1988-1993, 1995, 1998-2015, 2018-2021 Free Software
-   Foundation, Inc.
+   Copyright (C) 1988--1993, 1995, 1998--2015, 2018--2021, 2025--2026
+   Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
@@ -2629,8 +2629,8 @@ calculator.
 @example
 /* Parser for mfcalc.   -*- C -*-
 
-   Copyright (C) 1988-1993, 1995, 1998-2015, 2018-2021 Free Software
-   Foundation, Inc.
+   Copyright (C) 1988--1993, 1995, 1998--2015, 2018--2021, 2025--2026
+   Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
@@ -2765,8 +2765,8 @@ provides for either functions or variables to be placed in the table.
 @example
 /* Functions for mfcalc.   -*- C -*-
 
-   Copyright (C) 1988-1993, 1995, 1998-2015, 2018-2021 Free Software
-   Foundation, Inc.
+   Copyright (C) 1988--1993, 1995, 1998--2015, 2018--2021, 2025--2026
+   Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
@@ -11648,22 +11648,26 @@ Options controlling the diagnostics.
 Output warnings falling in @var{category}.  @var{category} can be one
 of:
 @table @code
-@item @anchor{Wconflicts-sr}conflicts-sr
-@itemx @anchor{Wconflicts-rr}conflicts-rr
+@item conflicts-sr
+@itemx conflicts-rr
+@anchor{Wconflicts-sr}
+@anchor{Wconflicts-rr}
 S/R and R/R conflicts.  These warnings are enabled by default.  However, if
 the @code{%expect} or @code{%expect-rr} directive is specified, an
 unexpected number of conflicts is an error, and an expected number of
 conflicts is not reported, so @option{-W} and @option{--warning} then have
 no effect on the conflict report.
 
-@item @anchor{Wcounterexamples}counterexamples
+@item counterexamples
 @itemx cex
+@anchor{Wcounterexamples}
 Provide counterexamples for conflicts.  @xref{Counterexamples}.
 Counterexamples take time to compute.  The option @option{-Wcex} should be
 used by the developer when working on the grammar; it hardly makes sense to
 use it in a CI.
 
-@item @anchor{Wdangling-alias}dangling-alias
+@item dangling-alias
+@anchor{Wdangling-alias}
 Report string literals that are not bound to a token symbol.
 
 String literals, which allow for better error messages, are (too) liberally
@@ -11709,16 +11713,19 @@ foo: "baz" @{@}
       |      @dwarning{^~~~~}
 @end example
 
-@item @anchor{Wdeprecated}deprecated
+@item deprecated
+@anchor{Wdeprecated}
 Deprecated constructs whose support will be removed in future versions of
 Bison.
 
-@item @anchor{Wempty-rule}empty-rule
+@item empty-rule
+@anchor{Wempty-rule}
 Empty rules without @code{%empty}.  @xref{Empty Rules}.  Disabled by
 default, but enabled by uses of @code{%empty}, unless
 @option{-Wno-empty-rule} was specified.
 
-@item @anchor{Wmidrule-values}midrule-values
+@item midrule-values
+@anchor{Wmidrule-values}
 Warn about midrule values that are set but not used within any of the actions
 of the parent rule.
 For example, warn about unused @code{$2} in:
@@ -11738,7 +11745,8 @@ These warnings are not enabled by default since they sometimes prove to
 be false alarms in existing grammars employing the Yacc constructs
 @code{$0} or @code{$-@var{n}} (where @var{n} is some positive integer).
 
-@item @anchor{Wprecedence}precedence
+@item precedence
+@anchor{Wprecedence}
 Useless precedence and associativity directives.  Disabled by default.
 
 Consider for instance the following grammar:
@@ -11799,21 +11807,24 @@ One would get the exact same parser with the following directives instead:
 @end group
 @end example
 
-@item @anchor{Wyacc}yacc
+@item yacc
+@anchor{Wyacc}
 Incompatibilities with POSIX Yacc.
 
-@item @anchor{Wother}other
+@item other
+@anchor{Wother}
 All warnings not categorized above.  These warnings are enabled by default.
 
 This category is provided merely for the sake of completeness.  Future
 releases of Bison may move warnings from this category to new, more specific
 categories.
 
-@item @anchor{Wall}all
+@item all
 All the warnings except @code{counterexamples}, @code{dangling-alias} and
 @code{yacc}.
 
-@item @anchor{Wnone}none
+@item none
+@anchor{Wnone}
 Turn off all the warnings.
 
 @item error
@@ -11824,7 +11835,8 @@ A category can be turned off by prefixing its name with @samp{no-}.  For
 instance, @option{-Wno-yacc} will hide the warnings about
 POSIX Yacc incompatibilities.
 
-@item @anchor{Werror}-Werror
+@item -Werror
+@anchor{Werror}
 Turn enabled warnings for every @var{category} into errors, unless they are
 explicitly disabled by @option{-Wno-error=@var{category}}.
 
@@ -11972,7 +11984,8 @@ This is similar to how most shells resolve commands.
 Pretend that @code{%token-table} was specified.  @xref{Decl Summary}.
 
 @item -y
-@itemx @anchor{option-yacc} --yacc
+@itemx  --yacc
+@anchor{option-yacc}
 Act more like the traditional @command{yacc} command:
 @itemize
 @item
@@ -12219,7 +12232,8 @@ generate C++.
 @example
 /* Simple variant-based parser.   -*- C++ -*-
 
-   Copyright (C) 2018-2021 Free Software Foundation, Inc.
+   Copyright (C) 1988--1993, 1995, 1998--2015, 2018--2021, 2025--2026
+   Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
@@ -13310,7 +13324,8 @@ library components, and the declaration of the parser class.
 @example
 /* Driver for calc++.   -*- C++ -*-
 
-   Copyright (C) 2005-2015, 2018-2021 Free Software Foundation, Inc.
+   Copyright (C) 1988--1993, 1995, 1998--2015, 2018--2021, 2025--2026
+   Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
@@ -13406,7 +13421,8 @@ The implementation of the driver (@file{driver.cc}) is straightforward.
 @example
 /* Driver for calc++.   -*- C++ -*-
 
-   Copyright (C) 2005-2015, 2018-2021 Free Software Foundation, Inc.
+   Copyright (C) 1988--1993, 1995, 1998--2015, 2018--2021, 2025--2026
+   Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
@@ -13473,7 +13489,8 @@ designed the grammar for.
 @example
 /* Parser for calc++.   -*- C++ -*-
 
-   Copyright (C) 2005-2015, 2018-2021 Free Software Foundation, Inc.
+   Copyright (C) 1988--1993, 1995, 1998--2015, 2018--2021, 2025--2026
+   Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
@@ -13685,7 +13702,8 @@ then the parser's to get the set of defined tokens.
 @example
 /* Scanner for calc++.   -*- C++ -*-
 
-   Copyright (C) 2005-2015, 2018-2021 Free Software Foundation, Inc.
+   Copyright (C) 1988--1993, 1995, 1998--2015, 2018--2021, 2025--2026
+   Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
@@ -13946,7 +13964,8 @@ The top level file, @file{calc++.cc}, poses no problem.
 @example
 /* Main for calc++.   -*- C++ -*-
 
-   Copyright (C) 2005-2015, 2018-2021 Free Software Foundation, Inc.
+   Copyright (C) 1988--1993, 1995, 1998--2015, 2018--2021, 2025--2026
+   Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/doc/bison.x b/doc/bison.x
index edaebe830..cb4f7a8d8 100644
--- a/doc/bison.x
+++ b/doc/bison.x
@@ -2,48 +2,49 @@
 bison \- GNU Project parser generator (yacc replacement)
 
 [description]
-.I Bison
-is a parser generator in the style of
-.IR yacc (1).
-It should be upwardly compatible with input files designed
-for
-.IR yacc .
+The
+.B bison
+parser generator inputs grammars in the style of
+.BR yacc (1)
+and outputs parsers for those grammers.
 .PP
 Input files should follow the
-.I yacc
+.B yacc
 convention of ending in
-.BR .y .
+.IR .y .
 Unlike
-.IR yacc ,
+.BR yacc ,
 the generated files do not have fixed names, but instead use the prefix
 of the input file.
-Moreover, if you need to put
-.I C++
-code in the input file, you can end his name by a C++-like extension
-(.ypp or .y++), then bison will follow your extension to name the
-output file (.cpp or .c++).
+Moreover, if you need to put C++
+code in the input file, you can end its name by a C++-like extension
+.RI ( .ypp
+or
+.IR .y++ ),
+and then
+.B bison
+will follow your extension to name the
+output file
+.RI ( .cpp
+or
+.IR .c++ ).
 For instance, a grammar description file named
-.B parse.yxx
+.I parse.yxx
 would produce the generated parser in a file named
-.BR parse.tab.cxx ,
+.IR parse.tab.cxx ,
 instead of
-.IR yacc 's
-.B y.tab.c
-or old
-.I Bison
-version's
-.BR parse.tab.c .
+.BR yacc 's
+.IR y.tab.c .
 .PP
 This description of the options that can be given to
-.I bison
+.B bison
 is adapted from the node
 .B Invocation
-in the
-.B bison.texi
-manual, which should be taken as authoritative.
+in the Bison manual, which should be taken as authoritative.
 .PP
-.I Bison
-supports both traditional single-letter options and mnemonic long
+The
+.B bison
+command supports both traditional single-letter options and mnemonic long
 option names.  Long option names are indicated with
 .B \-\-
 instead of
diff --git a/doc/local.mk b/doc/local.mk
index 1abe658ed..b42fed686 100644
--- a/doc/local.mk
+++ b/doc/local.mk
@@ -1,5 +1,5 @@
-## Copyright (C) 2001-2003, 2005-2015, 2018-2022 Free Software
-## Foundation, Inc.
+## Copyright (C) 2001-2003, 2005-2015, 2018-2022, 2025-2026 Free
+## Software Foundation, Inc.
 
 ## This program is free software: you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
diff --git a/doc/refcard.tex b/doc/refcard.tex
index 0e21a6493..9cc6828ab 100644
--- a/doc/refcard.tex
+++ b/doc/refcard.tex
@@ -19,8 +19,8 @@
 \def\finalout{\overfullrule=0pt}
 %\finalout
 
-% Copyright (c) 1998, 2001, 2009--2015, 2018--2022 Free Software
-% Foundation, Inc.
+% Copyright (c) 1998, 2001, 2009--2015, 2018--2022, 2025--2026 Free
+% Software Foundation, Inc.
 %
 % This file is part of Bison.
 %
diff --git a/doc/yacc.1.in b/doc/yacc.1.in
index 1d07483b0..e85bbffd7 100644
--- a/doc/yacc.1.in
+++ b/doc/yacc.1.in
@@ -5,14 +5,15 @@ yacc \- GNU Project parser generator
 .B yacc
 [\fIOPTION\fR]... \fIFILE\fR
 .SH DESCRIPTION
-.I Yacc
+The program
+.B yacc
 (Yet Another Compiler Compiler) is a parser generator.  This
 version is a simple wrapper around
-.IR bison (1).
+.BR bison (1).
 It passes option
 \fB\-y\fR, \fB\-\-yacc\fR
 to activate the upward compatibility mode.  See
-.IR bison (1)
+.BR bison (1)
 for more information.
 .SH AUTHOR
 Written by Paul Eggert.
diff --git a/etc/README.md b/etc/README.md
index 6ba4e763b..7196f2a18 100644
--- a/etc/README.md
+++ b/etc/README.md
@@ -22,7 +22,8 @@ fill-column: 76
 ispell-dictionary: "american"
 End:
 
-Copyright (C) 2006, 2009-2015, 2018-2022 Free Software Foundation, Inc.
+Copyright (C) 2006, 2009-2015, 2018-2022, 2025-2026 Free Software
+Foundation, Inc.
 
 This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/etc/bench.pl.in b/etc/bench.pl.in
index e2ea0748e..77e54c9eb 100755
--- a/etc/bench.pl.in
+++ b/etc/bench.pl.in
@@ -1,7 +1,7 @@
 #! /usr/bin/perl -w
 
-# Copyright (C) 2006, 2008-2015, 2018-2022 Free Software Foundation,
-# Inc.
+# Copyright (C) 2006, 2008-2015, 2018-2022, 2025-2026 Free Software
+# Foundation, Inc.
 #
 # This file is part of Bison, the GNU Compiler Compiler.
 #
diff --git a/etc/local.mk b/etc/local.mk
index 6f6bb6de8..48a02cdbd 100644
--- a/etc/local.mk
+++ b/etc/local.mk
@@ -1,5 +1,5 @@
-## Copyright (C) 2006, 2008-2015, 2018-2022 Free Software Foundation,
-## Inc.
+## Copyright (C) 2006, 2008-2015, 2018-2022, 2025-2026 Free Software
+## Foundation, Inc.
 
 ## This program is free software: you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
diff --git a/examples/README.md b/examples/README.md
index 7eafd8d29..02ceeea04 100644
--- a/examples/README.md
+++ b/examples/README.md
@@ -17,7 +17,7 @@ fill-column: 76
 ispell-dictionary: "american"
 End:
 
-Copyright (C) 2018-2022 Free Software Foundation, Inc.
+Copyright (C) 2018-2022, 2025-2026 Free Software Foundation, Inc.
 
 Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.3 or
diff --git a/examples/c++/README.md b/examples/c++/README.md
index 91ab18cf1..0861de996 100644
--- a/examples/c++/README.md
+++ b/examples/c++/README.md
@@ -55,7 +55,7 @@ fill-column: 76
 ispell-dictionary: "american"
 End:
 
-Copyright (C) 2018-2022 Free Software Foundation, Inc.
+Copyright (C) 2018-2022, 2025-2026 Free Software Foundation, Inc.
 
 Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.3 or
diff --git a/examples/c++/calc++/README.md b/examples/c++/calc++/README.md
index 11ee18107..a08969467 100644
--- a/examples/c++/calc++/README.md
+++ b/examples/c++/calc++/README.md
@@ -36,7 +36,7 @@ fill-column: 76
 ispell-dictionary: "american"
 End:
 
-Copyright (C) 2018-2022 Free Software Foundation, Inc.
+Copyright (C) 2018-2022, 2025-2026 Free Software Foundation, Inc.
 
 Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.3 or
diff --git a/examples/c++/calc++/calc++.test b/examples/c++/calc++/calc++.test
index 868a26012..f3c64ccfb 100755
--- a/examples/c++/calc++/calc++.test
+++ b/examples/c++/calc++/calc++.test
@@ -1,6 +1,7 @@
 #! /bin/sh
 
-# Copyright (C) 2005-2015, 2018-2022 Free Software Foundation, Inc.
+# Copyright (C) 2005-2015, 2018-2022, 2025-2026 Free Software
+# Foundation, Inc.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/examples/c++/calc++/local.mk b/examples/c++/calc++/local.mk
index 521cf4bff..e75123da4 100644
--- a/examples/c++/calc++/local.mk
+++ b/examples/c++/calc++/local.mk
@@ -1,5 +1,5 @@
-## Copyright (C) 2005-2006, 2008-2015, 2018-2022 Free Software
-## Foundation, Inc.
+## Copyright (C) 2005-2006, 2008-2015, 2018-2022, 2025-2026 Free
+## Software Foundation, Inc.
 ##
 ## This program is free software: you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
diff --git a/examples/c++/glr/README.md b/examples/c++/glr/README.md
index 7142bde28..176459948 100644
--- a/examples/c++/glr/README.md
+++ b/examples/c++/glr/README.md
@@ -13,7 +13,7 @@ fill-column: 76
 ispell-dictionary: "american"
 End:
 
-Copyright (C) 2020-2022 Free Software Foundation, Inc.
+Copyright (C) 2020-2022, 2025-2026 Free Software Foundation, Inc.
 
 This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/examples/c++/glr/ast.hh b/examples/c++/glr/ast.hh
index ba3ec2393..f47699ddc 100644
--- a/examples/c++/glr/ast.hh
+++ b/examples/c++/glr/ast.hh
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2020-2022 Free Software Foundation, Inc.
+  Copyright (C) 2020-2022, 2025-2026 Free Software Foundation, Inc.
 
   This program is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
diff --git a/examples/c++/glr/c++-types.test b/examples/c++/glr/c++-types.test
index 8f6050ea1..f29af4858 100644
--- a/examples/c++/glr/c++-types.test
+++ b/examples/c++/glr/c++-types.test
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# Copyright (C) 2020-2022 Free Software Foundation, Inc.
+# Copyright (C) 2020-2022, 2025-2026 Free Software Foundation, Inc.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/examples/c++/glr/c++-types.yy b/examples/c++/glr/c++-types.yy
index d011da048..5a0128f15 100644
--- a/examples/c++/glr/c++-types.yy
+++ b/examples/c++/glr/c++-types.yy
@@ -1,5 +1,5 @@
 /*                                                       -*- C++ -*-
-  Copyright (C) 2020-2022 Free Software Foundation, Inc.
+  Copyright (C) 2020-2022, 2025-2026 Free Software Foundation, Inc.
 
   This program is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
diff --git a/examples/c++/glr/local.mk b/examples/c++/glr/local.mk
index d5d01a1aa..8b70a3452 100644
--- a/examples/c++/glr/local.mk
+++ b/examples/c++/glr/local.mk
@@ -1,4 +1,4 @@
-## Copyright (C) 2020-2022 Free Software Foundation, Inc.
+## Copyright (C) 2020-2022, 2025-2026 Free Software Foundation, Inc.
 ##
 ## This program is free software: you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
diff --git a/examples/c++/local.mk b/examples/c++/local.mk
index dcaa83d79..7bbd4aaa3 100644
--- a/examples/c++/local.mk
+++ b/examples/c++/local.mk
@@ -1,4 +1,4 @@
-## Copyright (C) 2018-2022 Free Software Foundation, Inc.
+## Copyright (C) 2018-2022, 2025-2026 Free Software Foundation, Inc.
 ##
 ## This program is free software: you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
diff --git a/examples/c++/variant-11.test b/examples/c++/variant-11.test
index 946b50c0c..0df1cb143 100644
--- a/examples/c++/variant-11.test
+++ b/examples/c++/variant-11.test
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# Copyright (C) 2018-2022 Free Software Foundation, Inc.
+# Copyright (C) 2018-2022, 2025-2026 Free Software Foundation, Inc.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/examples/c++/variant-11.yy b/examples/c++/variant-11.yy
index f73cac911..e66ebde84 100644
--- a/examples/c++/variant-11.yy
+++ b/examples/c++/variant-11.yy
@@ -1,5 +1,6 @@
 /*
-  Copyright (C) 2008-2015, 2018-2022 Free Software Foundation, Inc.
+  Copyright (C) 2008-2015, 2018-2022, 2025-2026 Free Software
+  Foundation, Inc.
 
   This program is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
diff --git a/examples/c++/variant.test b/examples/c++/variant.test
index 122756a5f..6fb1a6ae3 100644
--- a/examples/c++/variant.test
+++ b/examples/c++/variant.test
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# Copyright (C) 2018-2022 Free Software Foundation, Inc.
+# Copyright (C) 2018-2022, 2025-2026 Free Software Foundation, Inc.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/examples/c++/variant.yy b/examples/c++/variant.yy
index a6cda01fb..cc7929e28 100644
--- a/examples/c++/variant.yy
+++ b/examples/c++/variant.yy
@@ -1,5 +1,6 @@
 /*
-  Copyright (C) 2008-2015, 2018-2022 Free Software Foundation, Inc.
+  Copyright (C) 2008-2015, 2018-2022, 2025-2026 Free Software
+  Foundation, Inc.
 
   This program is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
diff --git a/examples/c/README.md b/examples/c/README.md
index 7b5d63789..5525f7e06 100644
--- a/examples/c/README.md
+++ b/examples/c/README.md
@@ -81,7 +81,7 @@ fill-column: 76
 ispell-dictionary: "american"
 End:
 
-Copyright (C) 2018-2022 Free Software Foundation, Inc.
+Copyright (C) 2018-2022, 2025-2026 Free Software Foundation, Inc.
 
 This file is part of GNU bison, the GNU Compiler Compiler.
 
diff --git a/examples/c/bistromathic/README.md b/examples/c/bistromathic/README.md
index 21dfea83b..d35ad5d0d 100644
--- a/examples/c/bistromathic/README.md
+++ b/examples/c/bistromathic/README.md
@@ -32,7 +32,7 @@ fill-column: 76
 ispell-dictionary: "american"
 End:
 
-Copyright (C) 2020-2022 Free Software Foundation, Inc.
+Copyright (C) 2020-2022, 2025-2026 Free Software Foundation, Inc.
 
 This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/examples/c/bistromathic/bistromathic.test b/examples/c/bistromathic/bistromathic.test
index 4a8efe44d..4cd91753b 100755
--- a/examples/c/bistromathic/bistromathic.test
+++ b/examples/c/bistromathic/bistromathic.test
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# Copyright (C) 2020-2022 Free Software Foundation, Inc.
+# Copyright (C) 2020-2022, 2025-2026 Free Software Foundation, Inc.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/examples/c/bistromathic/local.mk b/examples/c/bistromathic/local.mk
index 343e8eb64..7af0fd1d5 100644
--- a/examples/c/bistromathic/local.mk
+++ b/examples/c/bistromathic/local.mk
@@ -1,4 +1,4 @@
-## Copyright (C) 2020-2022 Free Software Foundation, Inc.
+## Copyright (C) 2020-2022, 2025-2026 Free Software Foundation, Inc.
 ##
 ## This program is free software: you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
diff --git a/examples/c/bistromathic/parse.y b/examples/c/bistromathic/parse.y
index 99db35405..f62a8ff23 100644
--- a/examples/c/bistromathic/parse.y
+++ b/examples/c/bistromathic/parse.y
@@ -1,6 +1,6 @@
 /* Parser and scanner for bistromathic.   -*- C -*-
 
-   Copyright (C) 2019-2022 Free Software Foundation, Inc.
+   Copyright (C) 2019-2022, 2025-2026 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/examples/c/calc/README.md b/examples/c/calc/README.md
index a6ee7afad..9e81d5a22 100644
--- a/examples/c/calc/README.md
+++ b/examples/c/calc/README.md
@@ -9,7 +9,7 @@ fill-column: 76
 ispell-dictionary: "american"
 End:
 
-Copyright (C) 2019-2022 Free Software Foundation, Inc.
+Copyright (C) 2019-2022, 2025-2026 Free Software Foundation, Inc.
 
 This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/examples/c/calc/calc.test b/examples/c/calc/calc.test
index 4483103c6..303363729 100644
--- a/examples/c/calc/calc.test
+++ b/examples/c/calc/calc.test
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# Copyright (C) 2019-2022 Free Software Foundation, Inc.
+# Copyright (C) 2019-2022, 2025-2026 Free Software Foundation, Inc.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/examples/c/calc/local.mk b/examples/c/calc/local.mk
index 57cb58e56..b5f5c694c 100644
--- a/examples/c/calc/local.mk
+++ b/examples/c/calc/local.mk
@@ -1,4 +1,4 @@
-## Copyright (C) 2019-2022 Free Software Foundation, Inc.
+## Copyright (C) 2019-2022, 2025-2026 Free Software Foundation, Inc.
 ##
 ## This program is free software: you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
diff --git a/examples/c/glr/README.md b/examples/c/glr/README.md
index ee54f84e8..b55e1af60 100644
--- a/examples/c/glr/README.md
+++ b/examples/c/glr/README.md
@@ -10,7 +10,7 @@ fill-column: 76
 ispell-dictionary: "american"
 End:
 
-Copyright (C) 2020-2022 Free Software Foundation, Inc.
+Copyright (C) 2020-2022, 2025-2026 Free Software Foundation, Inc.
 
 This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/examples/c/glr/c++-types.test b/examples/c/glr/c++-types.test
index 71ce54853..e8d9813f7 100644
--- a/examples/c/glr/c++-types.test
+++ b/examples/c/glr/c++-types.test
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# Copyright (C) 2020-2022 Free Software Foundation, Inc.
+# Copyright (C) 2020-2022, 2025-2026 Free Software Foundation, Inc.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/examples/c/glr/c++-types.y b/examples/c/glr/c++-types.y
index ca592e27f..139c2b75b 100644
--- a/examples/c/glr/c++-types.y
+++ b/examples/c/glr/c++-types.y
@@ -1,5 +1,5 @@
 /*                                                       -*- C -*-
-  Copyright (C) 2020-2022 Free Software Foundation, Inc.
+  Copyright (C) 2020-2022, 2025-2026 Free Software Foundation, Inc.
 
   This program is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
diff --git a/examples/c/glr/local.mk b/examples/c/glr/local.mk
index fd5c09306..e5ff53215 100644
--- a/examples/c/glr/local.mk
+++ b/examples/c/glr/local.mk
@@ -1,4 +1,4 @@
-## Copyright (C) 2020-2022 Free Software Foundation, Inc.
+## Copyright (C) 2020-2022, 2025-2026 Free Software Foundation, Inc.
 ##
 ## This program is free software: you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
diff --git a/examples/c/lexcalc/README.md b/examples/c/lexcalc/README.md
index 59e94e3e5..989d19163 100644
--- a/examples/c/lexcalc/README.md
+++ b/examples/c/lexcalc/README.md
@@ -11,7 +11,7 @@ fill-column: 76
 ispell-dictionary: "american"
 End:
 
-Copyright (C) 2018-2022 Free Software Foundation, Inc.
+Copyright (C) 2018-2022, 2025-2026 Free Software Foundation, Inc.
 
 This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/examples/c/lexcalc/lexcalc.test b/examples/c/lexcalc/lexcalc.test
index 2fb66bae2..c9423fc68 100644
--- a/examples/c/lexcalc/lexcalc.test
+++ b/examples/c/lexcalc/lexcalc.test
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# Copyright (C) 2018-2022 Free Software Foundation, Inc.
+# Copyright (C) 2018-2022, 2025-2026 Free Software Foundation, Inc.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/examples/c/lexcalc/local.mk b/examples/c/lexcalc/local.mk
index 6e8d3c868..f9dff2025 100644
--- a/examples/c/lexcalc/local.mk
+++ b/examples/c/lexcalc/local.mk
@@ -1,4 +1,4 @@
-## Copyright (C) 2018-2022 Free Software Foundation, Inc.
+## Copyright (C) 2018-2022, 2025-2026 Free Software Foundation, Inc.
 ##
 ## This program is free software: you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
diff --git a/examples/c/lexcalc/parse.y b/examples/c/lexcalc/parse.y
index ad73f9e62..e8af1f194 100644
--- a/examples/c/lexcalc/parse.y
+++ b/examples/c/lexcalc/parse.y
@@ -1,6 +1,6 @@
 /* Parser for lexcalc.   -*- C -*-
 
-   Copyright (C) 2018-2022 Free Software Foundation, Inc.
+   Copyright (C) 2018-2022, 2025-2026 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/examples/c/lexcalc/scan.l b/examples/c/lexcalc/scan.l
index b6961be09..e8586e995 100644
--- a/examples/c/lexcalc/scan.l
+++ b/examples/c/lexcalc/scan.l
@@ -1,6 +1,6 @@
 /* Scanner for lexcalc.   -*- C -*-
 
-   Copyright (C) 2018-2022 Free Software Foundation, Inc.
+   Copyright (C) 2018-2022, 2025-2026 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/examples/c/local.mk b/examples/c/local.mk
index 45f9394f9..62abc9643 100644
--- a/examples/c/local.mk
+++ b/examples/c/local.mk
@@ -1,4 +1,4 @@
-## Copyright (C) 2018-2022 Free Software Foundation, Inc.
+## Copyright (C) 2018-2022, 2025-2026 Free Software Foundation, Inc.
 ##
 ## This program is free software: you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
diff --git a/examples/c/mfcalc/local.mk b/examples/c/mfcalc/local.mk
index 8957bbc0e..749363f5e 100644
--- a/examples/c/mfcalc/local.mk
+++ b/examples/c/mfcalc/local.mk
@@ -1,5 +1,5 @@
-## Copyright (C) 2005-2006, 2008-2015, 2018-2022 Free Software
-## Foundation, Inc.
+## Copyright (C) 2005-2006, 2008-2015, 2018-2022, 2025-2026 Free
+## Software Foundation, Inc.
 ##
 ## This program is free software: you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
diff --git a/examples/c/mfcalc/mfcalc.test b/examples/c/mfcalc/mfcalc.test
index 79c34d662..331f6ffc9 100755
--- a/examples/c/mfcalc/mfcalc.test
+++ b/examples/c/mfcalc/mfcalc.test
@@ -1,6 +1,7 @@
 #! /bin/sh
 
-# Copyright (C) 2005-2015, 2018-2022 Free Software Foundation, Inc.
+# Copyright (C) 2005-2015, 2018-2022, 2025-2026 Free Software
+# Foundation, Inc.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/examples/c/pushcalc/README.md b/examples/c/pushcalc/README.md
index 0d471d4d9..f4e41a77e 100644
--- a/examples/c/pushcalc/README.md
+++ b/examples/c/pushcalc/README.md
@@ -20,7 +20,7 @@ fill-column: 76
 ispell-dictionary: "american"
 End:
 
-Copyright (C) 2020-2022 Free Software Foundation, Inc.
+Copyright (C) 2020-2022, 2025-2026 Free Software Foundation, Inc.
 
 Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.3 or
diff --git a/examples/c/pushcalc/calc.test b/examples/c/pushcalc/calc.test
index c283704d5..07ae0c7d3 100644
--- a/examples/c/pushcalc/calc.test
+++ b/examples/c/pushcalc/calc.test
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# Copyright (C) 2020-2022 Free Software Foundation, Inc.
+# Copyright (C) 2020-2022, 2025-2026 Free Software Foundation, Inc.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/examples/c/pushcalc/calc.y b/examples/c/pushcalc/calc.y
index db4a4fdd3..dcfd1df10 100644
--- a/examples/c/pushcalc/calc.y
+++ b/examples/c/pushcalc/calc.y
@@ -1,6 +1,6 @@
 /* Parser and scanner for pushcalc.   -*- C -*-
 
-   Copyright (C) 2020-2022 Free Software Foundation, Inc.
+   Copyright (C) 2020-2022, 2025-2026 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/examples/c/pushcalc/local.mk b/examples/c/pushcalc/local.mk
index d9bfcb3d5..72ccb4d4e 100644
--- a/examples/c/pushcalc/local.mk
+++ b/examples/c/pushcalc/local.mk
@@ -1,4 +1,4 @@
-## Copyright (C) 2020-2022 Free Software Foundation, Inc.
+## Copyright (C) 2020-2022, 2025-2026 Free Software Foundation, Inc.
 ##
 ## This program is free software: you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
diff --git a/examples/c/reccalc/README.md b/examples/c/reccalc/README.md
index 65f7bf84a..25055b45d 100644
--- a/examples/c/reccalc/README.md
+++ b/examples/c/reccalc/README.md
@@ -26,7 +26,7 @@ fill-column: 76
 ispell-dictionary: "american"
 End:
 
-Copyright (C) 2018-2022 Free Software Foundation, Inc.
+Copyright (C) 2018-2022, 2025-2026 Free Software Foundation, Inc.
 
 Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.3 or
diff --git a/examples/c/reccalc/local.mk b/examples/c/reccalc/local.mk
index d13128e93..7f4711c05 100644
--- a/examples/c/reccalc/local.mk
+++ b/examples/c/reccalc/local.mk
@@ -1,4 +1,4 @@
-## Copyright (C) 2019-2022 Free Software Foundation, Inc.
+## Copyright (C) 2019-2022, 2025-2026 Free Software Foundation, Inc.
 ##
 ## This program is free software: you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
diff --git a/examples/c/reccalc/parse.y b/examples/c/reccalc/parse.y
index 5e401b73c..d7f09ad0d 100644
--- a/examples/c/reccalc/parse.y
+++ b/examples/c/reccalc/parse.y
@@ -1,6 +1,6 @@
 /* Parser for reccalc.   -*- C -*-
 
-   Copyright (C) 2019-2022 Free Software Foundation, Inc.
+   Copyright (C) 2019-2022, 2025-2026 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/examples/c/reccalc/reccalc.test b/examples/c/reccalc/reccalc.test
index 37255b378..99837ffff 100644
--- a/examples/c/reccalc/reccalc.test
+++ b/examples/c/reccalc/reccalc.test
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# Copyright (C) 2018-2022 Free Software Foundation, Inc.
+# Copyright (C) 2018-2022, 2025-2026 Free Software Foundation, Inc.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/examples/c/reccalc/scan.l b/examples/c/reccalc/scan.l
index 024b0d2ce..4ed13fa02 100644
--- a/examples/c/reccalc/scan.l
+++ b/examples/c/reccalc/scan.l
@@ -1,6 +1,6 @@
 /* Scanner for reccalc.   -*- C -*-
 
-   Copyright (C) 2019-2022 Free Software Foundation, Inc.
+   Copyright (C) 2019-2022, 2025-2026 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/examples/c/rpcalc/local.mk b/examples/c/rpcalc/local.mk
index 645024df4..62227f204 100644
--- a/examples/c/rpcalc/local.mk
+++ b/examples/c/rpcalc/local.mk
@@ -1,5 +1,5 @@
-## Copyright (C) 2005-2006, 2008-2015, 2018-2022 Free Software
-## Foundation, Inc.
+## Copyright (C) 2005-2006, 2008-2015, 2018-2022, 2025-2026 Free
+## Software Foundation, Inc.
 ##
 ## This program is free software: you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
diff --git a/examples/c/rpcalc/rpcalc.test b/examples/c/rpcalc/rpcalc.test
index 151950193..0721d43eb 100755
--- a/examples/c/rpcalc/rpcalc.test
+++ b/examples/c/rpcalc/rpcalc.test
@@ -1,6 +1,7 @@
 #! /bin/sh
 
-# Copyright (C) 2005-2015, 2018-2022 Free Software Foundation, Inc.
+# Copyright (C) 2005-2015, 2018-2022, 2025-2026 Free Software
+# Foundation, Inc.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/examples/d/README.md b/examples/d/README.md
index c7aec9128..5ec65b0a5 100644
--- a/examples/d/README.md
+++ b/examples/d/README.md
@@ -18,7 +18,7 @@ fill-column: 76
 ispell-dictionary: "american"
 End:
 
-Copyright (C) 2018-2022 Free Software Foundation, Inc.
+Copyright (C) 2018-2022, 2025-2026 Free Software Foundation, Inc.
 
 Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.3 or
diff --git a/examples/d/calc/calc.test b/examples/d/calc/calc.test
index 27f7385b0..3aeece1bd 100644
--- a/examples/d/calc/calc.test
+++ b/examples/d/calc/calc.test
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# Copyright (C) 2018-2022 Free Software Foundation, Inc.
+# Copyright (C) 2018-2022, 2025-2026 Free Software Foundation, Inc.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/examples/d/calc/calc.y b/examples/d/calc/calc.y
index 823534fa6..47f155559 100644
--- a/examples/d/calc/calc.y
+++ b/examples/d/calc/calc.y
@@ -1,6 +1,6 @@
 /* Parser and scanner for calc in D.   -*- D -*-
 
-   Copyright (C) 2018-2022 Free Software Foundation, Inc.
+   Copyright (C) 2018-2022, 2025-2026 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/examples/d/calc/local.mk b/examples/d/calc/local.mk
index 94a72af37..ceed1fd01 100644
--- a/examples/d/calc/local.mk
+++ b/examples/d/calc/local.mk
@@ -1,4 +1,4 @@
-## Copyright (C) 2018-2022 Free Software Foundation, Inc.
+## Copyright (C) 2018-2022, 2025-2026 Free Software Foundation, Inc.
 ##
 ## This program is free software: you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
diff --git a/examples/d/local.mk b/examples/d/local.mk
index cfd23dd3e..342d18bc2 100644
--- a/examples/d/local.mk
+++ b/examples/d/local.mk
@@ -1,4 +1,4 @@
-## Copyright (C) 2018-2022 Free Software Foundation, Inc.
+## Copyright (C) 2018-2022, 2025-2026 Free Software Foundation, Inc.
 ##
 ## This program is free software: you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
diff --git a/examples/d/simple/calc.test b/examples/d/simple/calc.test
index 819b00f68..6569266a7 100644
--- a/examples/d/simple/calc.test
+++ b/examples/d/simple/calc.test
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# Copyright (C) 2018-2022 Free Software Foundation, Inc.
+# Copyright (C) 2018-2022, 2025-2026 Free Software Foundation, Inc.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/examples/d/simple/calc.y b/examples/d/simple/calc.y
index 834d9a283..78dec21f7 100644
--- a/examples/d/simple/calc.y
+++ b/examples/d/simple/calc.y
@@ -1,6 +1,6 @@
 /* Parser and scanner for calc in D.   -*- D -*-
 
-   Copyright (C) 2018-2022 Free Software Foundation, Inc.
+   Copyright (C) 2018-2022, 2025-2026 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/examples/d/simple/local.mk b/examples/d/simple/local.mk
index f167bbf50..7ac9b039a 100644
--- a/examples/d/simple/local.mk
+++ b/examples/d/simple/local.mk
@@ -1,4 +1,4 @@
-## Copyright (C) 2018-2022 Free Software Foundation, Inc.
+## Copyright (C) 2018-2022, 2025-2026 Free Software Foundation, Inc.
 ##
 ## This program is free software: you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
diff --git a/examples/extexi b/examples/extexi
index cfc6f5113..bca3faf9a 100755
--- a/examples/extexi
+++ b/examples/extexi
@@ -3,8 +3,8 @@
 
 # This file is part of GNU Bison
 
-# Copyright (C) 1992, 2000-2001, 2005-2006, 2009-2015, 2018-2022 Free
-# Software Foundation, Inc.
+# Copyright (C) 1992, 2000-2001, 2005-2006, 2009-2015, 2018-2022,
+# 2025-2026 Free Software Foundation, Inc.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/examples/java/README.md b/examples/java/README.md
index 0cc5dbb98..39b46f1b1 100644
--- a/examples/java/README.md
+++ b/examples/java/README.md
@@ -19,7 +19,7 @@ fill-column: 76
 ispell-dictionary: "american"
 End:
 
-Copyright (C) 2018-2022 Free Software Foundation, Inc.
+Copyright (C) 2018-2022, 2025-2026 Free Software Foundation, Inc.
 
 Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.3 or
diff --git a/examples/java/calc/Calc.test b/examples/java/calc/Calc.test
index dca18c1e6..6fa2f5f8b 100644
--- a/examples/java/calc/Calc.test
+++ b/examples/java/calc/Calc.test
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# Copyright (C) 2018-2022 Free Software Foundation, Inc.
+# Copyright (C) 2018-2022, 2025-2026 Free Software Foundation, Inc.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/examples/java/calc/Calc.y b/examples/java/calc/Calc.y
index 575b41ea5..04c2a6732 100644
--- a/examples/java/calc/Calc.y
+++ b/examples/java/calc/Calc.y
@@ -1,6 +1,6 @@
 /* Parser and scanner for calc in Java.   -*- Java -*-
 
-   Copyright (C) 2018-2022 Free Software Foundation, Inc.
+   Copyright (C) 2018-2022, 2025-2026 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/examples/java/calc/local.mk b/examples/java/calc/local.mk
index c5a59c70d..e9f21ab63 100644
--- a/examples/java/calc/local.mk
+++ b/examples/java/calc/local.mk
@@ -1,4 +1,4 @@
-## Copyright (C) 2018-2022 Free Software Foundation, Inc.
+## Copyright (C) 2018-2022, 2025-2026 Free Software Foundation, Inc.
 ##
 ## This program is free software: you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
diff --git a/examples/java/local.mk b/examples/java/local.mk
index 594d0a579..6c618cb7a 100644
--- a/examples/java/local.mk
+++ b/examples/java/local.mk
@@ -1,4 +1,4 @@
-## Copyright (C) 2020-2022 Free Software Foundation, Inc.
+## Copyright (C) 2020-2022, 2025-2026 Free Software Foundation, Inc.
 ##
 ## This program is free software: you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
diff --git a/examples/java/simple/Calc.test b/examples/java/simple/Calc.test
index ab1f5c75f..f6cf6f95d 100644
--- a/examples/java/simple/Calc.test
+++ b/examples/java/simple/Calc.test
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# Copyright (C) 2018-2022 Free Software Foundation, Inc.
+# Copyright (C) 2018-2022, 2025-2026 Free Software Foundation, Inc.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/examples/java/simple/Calc.y b/examples/java/simple/Calc.y
index 175028fe4..225d9f2e0 100644
--- a/examples/java/simple/Calc.y
+++ b/examples/java/simple/Calc.y
@@ -1,6 +1,6 @@
 /* Simple parser and scanner in Java.   -*- Java -*-
 
-   Copyright (C) 2018-2022 Free Software Foundation, Inc.
+   Copyright (C) 2018-2022, 2025-2026 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/examples/java/simple/local.mk b/examples/java/simple/local.mk
index ae767a335..400306d6b 100644
--- a/examples/java/simple/local.mk
+++ b/examples/java/simple/local.mk
@@ -1,4 +1,4 @@
-## Copyright (C) 2018-2022 Free Software Foundation, Inc.
+## Copyright (C) 2018-2022, 2025-2026 Free Software Foundation, Inc.
 ##
 ## This program is free software: you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
diff --git a/examples/local.mk b/examples/local.mk
index 896ec7a05..84a0144fe 100644
--- a/examples/local.mk
+++ b/examples/local.mk
@@ -1,5 +1,5 @@
-## Copyright (C) 2005, 2008-2015, 2018-2022 Free Software Foundation,
-## Inc.
+## Copyright (C) 2005, 2008-2015, 2018-2022, 2025-2026 Free Software
+## Foundation, Inc.
 ##
 ## This program is free software: you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
diff --git a/examples/test b/examples/test
index 738dcae41..d7252b7eb 100755
--- a/examples/test
+++ b/examples/test
@@ -1,6 +1,7 @@
 #! /bin/sh
 
-# Copyright (C) 2005-2015, 2018-2022 Free Software Foundation, Inc.
+# Copyright (C) 2005-2015, 2018-2022, 2025-2026 Free Software
+# Foundation, Inc.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -53,6 +54,15 @@ if test -x "$abs_medir/$me"; then
 elif test -f "$abs_medir/$me.class"; then
     prog ()
     {
+        # In Cygwin-based environments, the Java implementation still is a
+        # native Windows Java.  Therefore we need to convert the elements
+        # of the class path from Cygwin syntax to native Windows syntax.
+        # The javaexec.sh script does not do this for us.
+        case `uname -s` in
+            CYGWIN*)
+                abs_medir=`cygpath -w "$abs_medir"`
+                ;;
+        esac
         "$SHELL" "$cwd/javaexec.sh" -cp "$abs_medir" "$me" "$@"
     }
 else
diff --git a/gnulib b/gnulib
index 71b603702..2410984b5 160000
--- a/gnulib
+++ b/gnulib
@@ -1 +1 @@
-Subproject commit 71b603702b8cf7977dedd5f6b71ea0ffc1669894
+Subproject commit 2410984b5bd06e4548dfbc09c85eee35e268e3dc
diff --git a/lib/.gitignore b/lib/.gitignore
index 9f15868f5..02b02e74c 100644
--- a/lib/.gitignore
+++ b/lib/.gitignore
@@ -6,7 +6,6 @@
 /.dirstamp
 /_Noreturn.h
 /access.c
-/alignof.h
 /alloca.h
 /alloca.in.h
 /allocator.c
@@ -18,6 +17,8 @@
 /argmatch.h
 /asnprintf.c
 /asprintf.c
+/assert.h
+/assert.in.h
 /assure.h
 /at-func.c
 /attribute.h
@@ -42,6 +43,22 @@
 /c-strncasecmp.c
 /c-strtod.c
 /c-strtod.h
+/c32is-impl.h
+/c32isalnum.c
+/c32isalpha.c
+/c32isblank.c
+/c32iscntrl.c
+/c32isdigit.c
+/c32isgraph.c
+/c32islower.c
+/c32isprint.c
+/c32ispunct.c
+/c32isspace.c
+/c32isupper.c
+/c32isxdigit.c
+/c32to-impl.h
+/c32tolower.c
+/c32width.c
 /calloc.c
 /canonicalize-lgpl.c
 /canonicalize.c
@@ -49,7 +66,6 @@
 /careadlinkat.c
 /careadlinkat.h
 /cdefs.h
-/charset.alias
 /chdir-long.c
 /chdir-long.h
 /cloexec.c
@@ -67,6 +83,7 @@
 /configmake.h
 /diffseq.h
 /dirent-private.h
+/dirent.h
 /dirent.in.h
 /dirfd.c
 /dirname-lgpl.c
@@ -81,6 +98,7 @@
 /errno.in.h
 /error.c
 /error.h
+/error.in.h
 /execute.c
 /execute.h
 /exitfail.c
@@ -106,6 +124,7 @@
 /filenamecat.h
 /findprog-in.c
 /findprog.h
+/flexmember.h
 /float+.h
 /float.c
 /float.h
@@ -183,15 +202,20 @@
 /gl_xlist.h
 /gl_xmap.c
 /gl_xmap.h
+/glthread/
 /gnulib.mk
 /hard-locale.c
 /hard-locale.h
-/hash-pjw.c
 /hash-pjw.h
-/hash-triple-simple.c
 /hash-triple.h
 /hash.c
 /hash.h
+/hashcode-file.h
+/hashcode-named-file.c
+/hashcode-string1.c
+/hashcode-string1.h
+/hashcode-string2.c
+/hashcode-string2.h
 /ialloc.c
 /ialloc.h
 /iconv.c
@@ -228,10 +252,12 @@
 /isnanl.c
 /iswblank.c
 /iswdigit.c
+/iswpunct.c
 /iswxdigit.c
 /itold.c
 /lc-charset-dispatch.c
 /lc-charset-dispatch.h
+/ldexp.c
 /ldexpl.c
 /libc-config.h
 /limits.h
@@ -240,8 +266,10 @@
 /localcharset.h
 /locale.h
 /locale.in.h
+/localeconv.c
 /lstat.c
 /malloc.c
+/malloc/
 /malloca.c
 /malloca.h
 /math.c
@@ -251,12 +279,17 @@
 /mbchar.h
 /mbfile.c
 /mbfile.h
+/mbiterf.c
+/mbiterf.h
+/mbrtoc32.c
 /mbrtowc-impl-utf8.h
 /mbrtowc-impl.h
 /mbrtowc.c
 /mbsinit.c
+/mbsnlen.c
 /mbswidth.c
 /mbswidth.h
+/mbszero.c
 /mbtowc-lock.c
 /mbtowc-lock.h
 /memchr.c
@@ -268,8 +301,11 @@
 /msvc-inval.h
 /msvc-nothrow.c
 /msvc-nothrow.h
+/next-prime.c
+/next-prime.h
 /obstack.c
 /obstack.h
+/obstack.in.h
 /obstack_printf.c
 /open.c
 /openat-die.c
@@ -298,6 +334,9 @@
 /progname.c
 /progname.h
 /progreloc.c
+/pthread-once.c
+/pthread.h
+/pthread.in.h
 /quote.h
 /quotearg.c
 /quotearg.h
@@ -310,14 +349,13 @@
 /readlink.c
 /realloc.c
 /reallocarray.c
-/ref-add.sed
-/ref-del.sed
 /relocatable.c
 /relocatable.h
 /relocwrapper.c
 /rename.c
 /rewinddir.c
 /rmdir.c
+/same-inode.c
 /same-inode.h
 /save-cwd.c
 /save-cwd.h
@@ -326,6 +364,7 @@
 /scratch_buffer.h
 /setenv.c
 /setlocale-lock.c
+/setlocale_null-unlocked.c
 /setlocale_null.c
 /setlocale_null.h
 /sig-handler.c
@@ -365,9 +404,8 @@
 /stat-w32.c
 /stat-w32.h
 /stat.c
-/stdalign.in.h
 /stdbool.h
-/stdbool.in.h
+/stdckdint.h
 /stdckdint.in.h
 /stddef.h
 /stddef.in.h
@@ -380,6 +418,7 @@
 /stdio-write.c
 /stdio.h
 /stdio.in.h
+/stdlib.c
 /stdlib.h
 /stdlib.in.h
 /stpcpy.c
@@ -394,22 +433,21 @@
 /strerror_r.c
 /string.h
 /string.in.h
+/strings.h
 /strings.in.h
 /stripslash.c
 /strndup.c
 /strnlen.c
 /strtod.c
 /strverscmp.c
-/sys
+/sys/
 /sys_ioctl.in.h
 /sys_resource.in.h
-/sys_socket.in.h
 /sys_stat.in.h
 /sys_time.in.h
 /sys_times.in.h
 /sys_types.in.h
 /sys_wait.in.h
-/sysexits.in.h
 /termios.h
 /termios.in.h
 /textstyle.h
@@ -421,9 +459,18 @@
 /timespec.h
 /timevar.c
 /timevar.h
+/uchar.h
+/uchar.in.h
+/unicase.h
+/unicase.in.h
+/unicase/
 /unicodeio.c
 /unicodeio.h
+/unictype.h
+/unictype.in.h
 /unictype/
+/uninorm.h
+/uninorm.in.h
 /unistd--.h
 /unistd-safer.h
 /unistd.c
@@ -434,9 +481,9 @@
 /unistr/
 /unitypes.h
 /unitypes.in.h
-/uniwidth
 /uniwidth.h
 /uniwidth.in.h
+/uniwidth/
 /unlink.c
 /unlocked-io.h
 /unsetenv.c
@@ -445,8 +492,11 @@
 /vasprintf.c
 /verify.h
 /vfprintf.c
+/vfzprintf.c
 /vsnprintf.c
+/vsnzprintf.c
 /vsprintf.c
+/vszprintf.c
 /wait-process.c
 /wait-process.h
 /waitpid.c
@@ -462,6 +512,8 @@
 /windows-mutex.h
 /windows-once.c
 /windows-once.h
+/windows-path.c
+/windows-path.h
 /windows-recmutex.c
 /windows-recmutex.h
 /windows-rwlock.c
diff --git a/lib/get-errno.c b/lib/get-errno.c
index 8910ccf39..b62c87550 100644
--- a/lib/get-errno.c
+++ b/lib/get-errno.c
@@ -1,7 +1,7 @@
 /* get-errno.c - get and set errno.
 
-   Copyright (C) 2002, 2006, 2009-2015, 2018-2022 Free Software
-   Foundation, Inc.
+   Copyright (C) 2002, 2006, 2009-2015, 2018-2022, 2025-2026 Free
+   Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/lib/get-errno.h b/lib/get-errno.h
index 24570c8ea..2a09fe38c 100644
--- a/lib/get-errno.h
+++ b/lib/get-errno.h
@@ -1,7 +1,7 @@
 /* get-errno.h - get and set errno.
 
-   Copyright (C) 2002, 2009-2015, 2018-2022 Free Software Foundation,
-   Inc.
+   Copyright (C) 2002, 2009-2015, 2018-2022, 2025-2026 Free Software
+   Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/lib/glthread/.gitignore b/lib/glthread/.gitignore
deleted file mode 100644
index b854214e8..000000000
--- a/lib/glthread/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-/lock.c
-/lock.h
-/threadlib.c
-/tls.c
-/tls.h
diff --git a/lib/local.mk b/lib/local.mk
index 443901696..2a1df5363 100644
--- a/lib/local.mk
+++ b/lib/local.mk
@@ -1,4 +1,5 @@
-## Copyright (C) 2001-2015, 2018-2022 Free Software Foundation, Inc.
+## Copyright (C) 2001-2015, 2018-2022, 2025-2026 Free Software
+## Foundation, Inc.
 ##
 ## This program is free software: you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
diff --git a/lib/main.c b/lib/main.c
index 04ceffffa..a6bd80887 100644
--- a/lib/main.c
+++ b/lib/main.c
@@ -1,7 +1,7 @@
 /* Yacc library main function.
 
-   Copyright (C) 2002, 2009-2015, 2018-2022 Free Software Foundation,
-   Inc.
+   Copyright (C) 2002, 2009-2015, 2018-2022, 2025-2026 Free Software
+   Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/lib/malloc/.gitignore b/lib/malloc/.gitignore
deleted file mode 100644
index 5f8866f90..000000000
--- a/lib/malloc/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-/scratch_buffer.gl.h
-/scratch_buffer.h
-/scratch_buffer_dupfree.c
-/scratch_buffer_grow.c
-/scratch_buffer_grow_preserve.c
-/scratch_buffer_set_array_size.c
diff --git a/lib/path-join.c b/lib/path-join.c
index ffde38c33..b74c66cdc 100644
--- a/lib/path-join.c
+++ b/lib/path-join.c
@@ -1,5 +1,5 @@
 /* Concatenate path components.
-   Copyright (C) 2018-2022 Free Software Foundation, Inc.
+   Copyright (C) 2018-2022, 2025-2026 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
diff --git a/lib/path-join.h b/lib/path-join.h
index 522250785..4c4b0c622 100644
--- a/lib/path-join.h
+++ b/lib/path-join.h
@@ -1,5 +1,5 @@
 /* Concatenate path components.
-   Copyright (C) 2018-2022 Free Software Foundation, Inc.
+   Copyright (C) 2018-2022, 2025-2026 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
diff --git a/lib/timevar.def b/lib/timevar.def
index 6606fed90..650574fbc 100644
--- a/lib/timevar.def
+++ b/lib/timevar.def
@@ -1,8 +1,8 @@
 /* This file contains the definitions for timing variables used to -*- C -*-
    measure run-time performance of the compiler.
 
-   Copyright (C) 2002, 2007, 2009-2015, 2018-2022 Free Software
-   Foundation, Inc.
+   Copyright (C) 2002, 2007, 2009-2015, 2018-2022, 2025-2026 Free
+   Software Foundation, Inc.
 
    Contributed by Akim Demaille <akim@freefriends.org>.
 
diff --git a/lib/yyerror.c b/lib/yyerror.c
index 8b86f1c68..b87d46276 100644
--- a/lib/yyerror.c
+++ b/lib/yyerror.c
@@ -1,7 +1,7 @@
 /* Yacc library error-printing function.
 
-   Copyright (C) 2002, 2009-2015, 2018-2022 Free Software Foundation,
-   Inc.
+   Copyright (C) 2002, 2009-2015, 2018-2022, 2025-2026 Free Software
+   Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/m4/.gitignore b/m4/.gitignore
index 4748c6e07..fdbb1f9d1 100644
--- a/m4/.gitignore
+++ b/m4/.gitignore
@@ -6,8 +6,12 @@
 /alloca.m4
 /asm-underscore.m4
 /assert.m4
+/assert_h.m4
+/build-to-host.m4
 /builtin-expect.m4
+/c-bool.m4
 /c-strtod.m4
+/c32rtomb.m4
 /calloc.m4
 /canonicalize.m4
 /chdir-long.m4
@@ -24,27 +28,31 @@
 /dup.m4
 /dup2.m4
 /eaccess.m4
-/eealloc.m4
 /environ.m4
 /errno_h.m4
 /error.m4
+/error_h.m4
 /execute.m4
 /exponentd.m4
 /exponentf.m4
 /exponentl.m4
+/extensions-aix.m4
 /extensions.m4
 /extern-inline.m4
 /extern-inline.m4~
 /fatal-signal.m4
 /fchdir.m4
+/fclose.m4
 /fcntl-o.m4
 /fcntl.m4
 /fcntl_h.m4
 /fdopendir.m4
+/fflush.m4
 /ffs.m4
 /ffsl.m4
 /filenamecat.m4
 /findprog-in.m4
+/flexmember.m4
 /float_h.m4
 /fopen.m4
 /fpending.m4
@@ -65,7 +73,6 @@
 /gethrxtime.m4
 /getline.m4
 /getopt.m4
-/getpagesize.m4
 /getprogname.m4
 /getrusage.m4
 /gettext.m4
@@ -76,12 +83,14 @@
 /gnulib-cache.m4
 /gnulib-common.m4
 /gnulib-comp.m4
+/gnulib-i18n.m4
 /gnulib-tool.m4
 /host-cpu-c-abi.m4
 /iconv.m4
 /iconv_h.m4
 /iconv_open.m4
 /include_next.m4
+/init-package-version.m4
 /inline.m4
 /intdiv0.m4
 /intl-thread-locale.m4
@@ -99,6 +108,7 @@
 /isnanl.m4
 /iswblank.m4
 /iswdigit.m4
+/iswpunct.m4
 /iswxdigit.m4
 /javacomp.m4
 /javaexec.m4
@@ -116,10 +126,12 @@
 /libunistring-base.m4
 /limits-h.m4
 /localcharset.m4
+/locale-en.m4
 /locale-fr.m4
 /locale-ja.m4
 /locale-zh.m4
 /locale_h.m4
+/localeconv.m4
 /lock.m4
 /longlong.m4
 /lstat.m4
@@ -128,6 +140,8 @@
 /math_h.m4
 /mbchar.m4
 /mbfile.m4
+/mbiter.m4
+/mbrtoc32.m4
 /mbrtowc.m4
 /mbsinit.m4
 /mbstate_t.m4
@@ -146,7 +160,9 @@
 /nocrash.m4
 /obstack-printf.m4
 /obstack.m4
+/off64_t.m4
 /off_t.m4
+/once.m4
 /open-cloexec.m4
 /open-slash.m4
 /open.m4
@@ -162,10 +178,12 @@
 /posix_spawn_faction_addchdir.m4
 /printf-frexp.m4
 /printf-frexpl.m4
-/printf-posix-rpl.m4
 /printf-posix.m4
 /printf.m4
 /progtest.m4
+/pthread-once.m4
+/pthread-spin.m4
+/pthread_h.m4
 /pthread_rwlock_rdlock.m4
 /quote.m4
 /quotearg.m4
@@ -202,7 +220,7 @@
 /stat.m4
 /std-gnu11.m4
 /stdalign.m4
-/stdbool.m4
+/stdckdint_h.m4
 /stddef_h.m4
 /stdint.m4
 /stdint_h.m4
@@ -220,6 +238,7 @@
 /strnlen.m4
 /strtod.m4
 /strverscmp.m4
+/sys_cdefs_h.m4
 /sys_ioctl_h.m4
 /sys_resource_h.m4
 /sys_socket_h.m4
@@ -233,10 +252,15 @@
 /time_h.m4
 /timespec.m4
 /tls.m4
+/uchar_h.m4
 /uintmax_t.m4
+/unicase_h.m4
 /unicodeio.m4
+/unictype_h.m4
+/uninorm_h.m4
 /unistd-safer.m4
 /unistd_h.m4
+/unitypes_h.m4
 /unlink.m4
 /unlocked-io.m4
 /vararrays.m4
@@ -260,5 +284,4 @@
 /xalloc.m4
 /xsize.m4
 /xstrndup.m4
-/year2038.m4
 /zzgnulib.m4
diff --git a/m4/bison-check-compiler-flag.m4 b/m4/bison-check-compiler-flag.m4
index 898530692..43b6312a0 100644
--- a/m4/bison-check-compiler-flag.m4
+++ b/m4/bison-check-compiler-flag.m4
@@ -2,7 +2,7 @@
 
 # serial 1
 
-# Copyright (C) 2018-2022 Free Software Foundation, Inc.
+# Copyright (C) 2018-2022, 2025-2026 Free Software Foundation, Inc.
 
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
diff --git a/m4/bison-cxx-std.m4 b/m4/bison-cxx-std.m4
index cc7fea19e..34067791c 100644
--- a/m4/bison-cxx-std.m4
+++ b/m4/bison-cxx-std.m4
@@ -1,6 +1,6 @@
 # bison-cxx-std.m4 serial 1
 
-# Copyright (C) 2018-2022 Free Software Foundation, Inc.
+# Copyright (C) 2018-2022, 2025-2026 Free Software Foundation, Inc.
 
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
diff --git a/m4/bison-i18n.m4 b/m4/bison-i18n.m4
index 24d539918..f648d9d8c 100644
--- a/m4/bison-i18n.m4
+++ b/m4/bison-i18n.m4
@@ -1,7 +1,7 @@
 # bison-i18n.m4 serial 2
 
-dnl Copyright (C) 2005-2006, 2009-2015, 2018-2022 Free Software
-dnl Foundation, Inc.
+dnl Copyright (C) 2005-2006, 2009-2015, 2018-2022, 2025-2026 Free
+dnl Software Foundation, Inc.
 
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
diff --git a/m4/c-working.m4 b/m4/c-working.m4
index 4087ebbaa..79b351418 100644
--- a/m4/c-working.m4
+++ b/m4/c-working.m4
@@ -1,7 +1,7 @@
 # Sanity test a C compiler.
 
-# Copyright (C) 2006, 2009-2015, 2018-2022 Free Software Foundation,
-# Inc.
+# Copyright (C) 2006, 2009-2015, 2018-2022, 2025-2026 Free Software
+# Foundation, Inc.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/m4/cxx.m4 b/m4/cxx.m4
index cb6e9fcfd..9dc529ee5 100644
--- a/m4/cxx.m4
+++ b/m4/cxx.m4
@@ -1,8 +1,8 @@
 # -*- Autoconf -*-
 # Sanity-test a C++ compiler.
 #
-# Copyright (C) 2004, 2006, 2009-2015, 2018-2022 Free Software
-# Foundation, Inc.
+# Copyright (C) 2004, 2006, 2009-2015, 2018-2022, 2025-2026 Free
+# Software Foundation, Inc.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/m4/flex.m4 b/m4/flex.m4
index c5ed43ace..f7bd638ae 100644
--- a/m4/flex.m4
+++ b/m4/flex.m4
@@ -1,5 +1,6 @@
 # flex.m4 serial 2
-# Copyright (C) 2012-2015, 2018-2022 Free Software Foundation, Inc.
+# Copyright (C) 2012-2015, 2018-2022, 2025-2026 Free Software
+# Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
diff --git a/src/AnnotationList.c b/src/AnnotationList.c
index 3604daa7a..6dd4b5edc 100644
--- a/src/AnnotationList.c
+++ b/src/AnnotationList.c
@@ -1,6 +1,7 @@
 /* IELR's inadequacy annotation list.
 
-   Copyright (C) 2009-2015, 2018-2022 Free Software Foundation, Inc.
+   Copyright (C) 2009-2015, 2018-2022, 2025-2026 Free Software
+   Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/AnnotationList.h b/src/AnnotationList.h
index 52958abc3..ec49f5c50 100644
--- a/src/AnnotationList.h
+++ b/src/AnnotationList.h
@@ -1,6 +1,7 @@
 /* IELR's inadequacy annotation list.
 
-   Copyright (C) 2009-2015, 2018-2022 Free Software Foundation, Inc.
+   Copyright (C) 2009-2015, 2018-2022, 2025-2026 Free Software
+   Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/InadequacyList.c b/src/InadequacyList.c
index 63093a99d..a77056447 100644
--- a/src/InadequacyList.c
+++ b/src/InadequacyList.c
@@ -1,6 +1,7 @@
 /* IELR's inadequacy list.
 
-   Copyright (C) 2009-2015, 2018-2022 Free Software Foundation, Inc.
+   Copyright (C) 2009-2015, 2018-2022, 2025-2026 Free Software
+   Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/InadequacyList.h b/src/InadequacyList.h
index caa0a933f..bc9f4bc7e 100644
--- a/src/InadequacyList.h
+++ b/src/InadequacyList.h
@@ -1,6 +1,7 @@
 /* IELR's inadequacy list.
 
-   Copyright (C) 2009-2015, 2018-2022 Free Software Foundation, Inc.
+   Copyright (C) 2009-2015, 2018-2022, 2025-2026 Free Software
+   Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/Sbitset.c b/src/Sbitset.c
index 2636ad59b..2a81fd2a9 100644
--- a/src/Sbitset.c
+++ b/src/Sbitset.c
@@ -1,6 +1,7 @@
 /* A simple, memory-efficient bitset implementation.
 
-   Copyright (C) 2009-2015, 2018-2022 Free Software Foundation, Inc.
+   Copyright (C) 2009-2015, 2018-2022, 2025-2026 Free Software
+   Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/Sbitset.h b/src/Sbitset.h
index c232d85f5..bd163c6ac 100644
--- a/src/Sbitset.h
+++ b/src/Sbitset.h
@@ -1,6 +1,7 @@
 /* A simple, memory-efficient bitset implementation.
 
-   Copyright (C) 2009-2015, 2018-2022 Free Software Foundation, Inc.
+   Copyright (C) 2009-2015, 2018-2022, 2025-2026 Free Software
+   Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/assoc.c b/src/assoc.c
index 5ebf6d1c5..efc8dcc8a 100644
--- a/src/assoc.c
+++ b/src/assoc.c
@@ -1,7 +1,7 @@
 /* Associativity information.
 
-   Copyright (C) 2002, 2005-2006, 2008-2015, 2018-2022 Free Software
-   Foundation, Inc.
+   Copyright (C) 2002, 2005-2006, 2008-2015, 2018-2022, 2025-2026 Free
+   Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/assoc.h b/src/assoc.h
index 41d43caab..570c52f95 100644
--- a/src/assoc.h
+++ b/src/assoc.h
@@ -1,7 +1,7 @@
 /* Associativity information.
 
-   Copyright (C) 2002, 2006, 2008-2015, 2018-2022 Free Software
-   Foundation, Inc.
+   Copyright (C) 2002, 2006, 2008-2015, 2018-2022, 2025-2026 Free
+   Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/closure.c b/src/closure.c
index c138cf164..1802114da 100644
--- a/src/closure.c
+++ b/src/closure.c
@@ -1,7 +1,7 @@
 /* Closures for Bison
 
    Copyright (C) 1984, 1989, 2000-2002, 2004-2005, 2007, 2009-2015,
-   2018-2022 Free Software Foundation, Inc.
+   2018-2022, 2025-2026 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/closure.h b/src/closure.h
index c29a76b4d..c02197568 100644
--- a/src/closure.h
+++ b/src/closure.h
@@ -1,7 +1,7 @@
 /* Subroutines for bison
 
-   Copyright (C) 1984, 1989, 2000-2002, 2007, 2009-2015, 2018-2022 Free
-   Software Foundation, Inc.
+   Copyright (C) 1984, 1989, 2000-2002, 2007, 2009-2015, 2018-2022,
+   2025-2026 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/complain.c b/src/complain.c
index 964a56426..2da3ab6b6 100644
--- a/src/complain.c
+++ b/src/complain.c
@@ -1,7 +1,7 @@
 /* Declaration for error-reporting function for Bison.
 
-   Copyright (C) 2000-2002, 2004-2006, 2009-2015, 2018-2022 Free
-   Software Foundation, Inc.
+   Copyright (C) 2000-2002, 2004-2006, 2009-2015, 2018-2022, 2025-2026
+   Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/src/complain.h b/src/complain.h
index 818427f5f..cb63127c3 100644
--- a/src/complain.h
+++ b/src/complain.h
@@ -1,7 +1,7 @@
 /* Declaration for error-reporting function for Bison.
 
-   Copyright (C) 2000-2002, 2006, 2009-2015, 2018-2022 Free Software
-   Foundation, Inc.
+   Copyright (C) 2000-2002, 2006, 2009-2015, 2018-2022, 2025-2026 Free
+   Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/src/conflicts.c b/src/conflicts.c
index 3bf0937f9..ceed45473 100644
--- a/src/conflicts.c
+++ b/src/conflicts.c
@@ -1,7 +1,7 @@
 /* Find and resolve or report lookahead conflicts for bison,
 
-   Copyright (C) 1984, 1989, 1992, 2000-2015, 2018-2022 Free Software
-   Foundation, Inc.
+   Copyright (C) 1984, 1989, 1992, 2000-2015, 2018-2022, 2025-2026 Free
+   Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/conflicts.h b/src/conflicts.h
index 07d74af2e..9391b8fee 100644
--- a/src/conflicts.h
+++ b/src/conflicts.h
@@ -1,7 +1,7 @@
 /* Find and resolve or report lookahead conflicts for bison,
 
-   Copyright (C) 2000-2002, 2004, 2007, 2009-2015, 2018-2022 Free
-   Software Foundation, Inc.
+   Copyright (C) 2000-2002, 2004, 2007, 2009-2015, 2018-2022, 2025-2026
+   Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/counterexample.c b/src/counterexample.c
index 82ee43da6..df3708064 100644
--- a/src/counterexample.c
+++ b/src/counterexample.c
@@ -1,6 +1,6 @@
 /* Conflict counterexample generation
 
-   Copyright (C) 2020-2022 Free Software Foundation, Inc.
+   Copyright (C) 2020-2022, 2025-2026 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
@@ -206,8 +206,9 @@ si_bfs_contains (const si_bfs_node *n, state_item_number sin)
 }
 
 static void
-si_bfs_free (si_bfs_node *n)
+si_bfs_free (void const *vn)
 {
+  si_bfs_node *n = deconst (vn);
   if (n == NULL)
     return;
   --n->reference_count;
@@ -231,12 +232,10 @@ typedef gl_list_t si_bfs_node_list;
 static inline derivation_list
 expand_to_conflict (state_item_number start, symbol_number conflict_sym)
 {
-  si_bfs_node *init = si_bfs_new (start, NULL);
-
+  void const *init = si_bfs_new (start, NULL);
   si_bfs_node_list queue
     = gl_list_create (GL_LINKED_LIST, NULL, NULL,
-                      (gl_listelement_dispose_fn) si_bfs_free,
-                      true, 1, (const void **) &init);
+                      si_bfs_free, true, 1, &init);
   si_bfs_node *node = NULL;
   // breadth-first search for a path of productions to the conflict symbol
   while (gl_list_size (queue) > 0)
@@ -471,11 +470,10 @@ nonunifying_shift_path (state_item_list reduce_path, state_item *shift_conflict)
         continue;
 
       // bfs to find a shift to the right state
-      si_bfs_node *init = si_bfs_new (si - state_items, NULL);
+      void const *init = si_bfs_new (si - state_items, NULL);
       si_bfs_node_list queue
         = gl_list_create (GL_LINKED_LIST, NULL, NULL,
-                          (gl_listelement_dispose_fn) si_bfs_free,
-                          true, 1, (const void **) &init);
+                          si_bfs_free, true, 1, &init);
       si_bfs_node *sis = NULL;
       state_item *prevsi = NULL;
       while (gl_list_size (queue) > 0)
@@ -604,15 +602,17 @@ copy_search_state (search_state *parent)
 }
 
 static void
-search_state_free_children (search_state *ss)
+search_state_free_children (void const *vss)
 {
+  search_state const *ss = vss;
   free_parse_state (ss->states[0]);
   free_parse_state (ss->states[1]);
 }
 
 static void
-search_state_free (search_state *ss)
+search_state_free (void *vss)
 {
+  search_state *ss = vss;
   if (ss == NULL)
     return;
   search_state_free_children (ss);
@@ -691,42 +691,51 @@ typedef struct
 } search_state_bundle;
 
 static void
-ssb_free (search_state_bundle *ssb)
+ssb_free (void const *vssb)
 {
+  search_state_bundle *ssb = deconst (vssb);
   gl_list_free (ssb->states);
   free (ssb);
 }
 
 static size_t
-ssb_hasher (search_state_bundle *ssb)
+ssb_hasher (void const *vssb)
 {
+  search_state_bundle const *ssb = vssb;
   return ssb->complexity;
 }
 
 static int
-ssb_comp (const search_state_bundle *s1, const search_state_bundle *s2)
+ssb_comp (void const *vs1, void const *vs2)
 {
+  search_state_bundle const *s1 = vs1;
+  search_state_bundle const *s2 = vs2;
   return s1->complexity - s2->complexity;
 }
 
 static bool
-ssb_equals (const search_state_bundle *s1, const search_state_bundle *s2)
+ssb_equals (void const *vs1, void const *vs2)
 {
+  search_state_bundle const *s1 = vs1;
+  search_state_bundle const *s2 = vs2;
   return s1->complexity == s2->complexity;
 }
 
 typedef gl_list_t ssb_list;
 
 static size_t
-visited_hasher (const search_state *ss, size_t max)
+visited_hasher (void const *vss, size_t max)
 {
+  search_state const *ss = vss;
   return (parse_state_hasher (ss->states[0], max)
           + parse_state_hasher (ss->states[1], max)) % max;
 }
 
 static bool
-visited_comparator (const search_state *ss1, const search_state *ss2)
+visited_comparator (void const *vss1, void const *vss2)
 {
+  search_state const *ss1 = vss1;
+  search_state const *ss2 = vss2;
   return parse_state_comparator (ss1->states[0], ss2->states[0])
     && parse_state_comparator (ss1->states[1], ss2->states[1]);
 }
@@ -762,9 +771,8 @@ ssb_append (search_state *ss)
     {
       ssb->states =
         gl_list_create_empty (GL_LINKED_LIST, NULL, NULL,
-                              (gl_listelement_dispose_fn)search_state_free_children,
-                              true);
-      gl_sortedlist_add (ssb_queue, (gl_listelement_compar_fn) ssb_comp, ssb);
+                              search_state_free_children, true);
+      gl_sortedlist_add (ssb_queue, ssb_comp, ssb);
     }
   else
     {
@@ -1109,15 +1117,12 @@ unifying_example (state_item_number itm1,
   state_item *conflict1 = &state_items[itm1];
   state_item *conflict2 = &state_items[itm2];
   search_state *initial = initial_search_state (conflict1, conflict2);
-  ssb_queue = gl_list_create_empty (GL_RBTREEHASH_LIST,
-                                    (gl_listelement_equals_fn) ssb_equals,
-                                    (gl_listelement_hashcode_fn) ssb_hasher,
-                                    (gl_listelement_dispose_fn) ssb_free,
-                                    false);
+  ssb_queue = gl_list_create_empty (GL_RBTREEHASH_LIST, ssb_equals,
+                                    ssb_hasher, ssb_free, false);
   visited =
-    hash_initialize (32, NULL, (Hash_hasher) visited_hasher,
-                     (Hash_comparator) visited_comparator,
-                     (Hash_data_freer) search_state_free);
+    hash_initialize (32, NULL, visited_hasher,
+                     visited_comparator,
+                     search_state_free);
   ssb_append (initial);
   xtime_t start = gethrxtime ();
   bool assurance_printed = false;
@@ -1181,8 +1186,7 @@ unifying_example (state_item_number itm1,
             }
           generate_next_states (ss, conflict1, conflict2);
         }
-      gl_sortedlist_remove (ssb_queue,
-                            (gl_listelement_compar_fn) ssb_comp, ssb);
+      gl_sortedlist_remove (ssb_queue, ssb_comp, ssb);
     }
 cex_search_end:;
   if (!cex)
diff --git a/src/counterexample.h b/src/counterexample.h
index 53728f9b6..72b8f7bfa 100644
--- a/src/counterexample.h
+++ b/src/counterexample.h
@@ -1,6 +1,6 @@
 /* Conflict counterexample generation
 
-   Copyright (C) 2020-2022 Free Software Foundation, Inc.
+   Copyright (C) 2020-2022, 2025-2026 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/derivation.c b/src/derivation.c
index f96ed4a79..2199f9c3f 100644
--- a/src/derivation.c
+++ b/src/derivation.c
@@ -1,6 +1,6 @@
 /* Counterexample derivation trees
 
-   Copyright (C) 2020-2022 Free Software Foundation, Inc.
+   Copyright (C) 2020-2022, 2025-2026 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/derivation.h b/src/derivation.h
index db0438625..c194cfeb4 100644
--- a/src/derivation.h
+++ b/src/derivation.h
@@ -1,6 +1,6 @@
 /* Counterexample derivation trees
 
-   Copyright (C) 2020-2022 Free Software Foundation, Inc.
+   Copyright (C) 2020-2022, 2025-2026 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/derives.c b/src/derives.c
index 44db49477..a5a7fcbbc 100644
--- a/src/derives.c
+++ b/src/derives.c
@@ -1,7 +1,7 @@
 /* Match rules with nonterminals for bison,
 
-   Copyright (C) 1984, 1989, 2000-2003, 2005, 2009-2015, 2018-2022 Free
-   Software Foundation, Inc.
+   Copyright (C) 1984, 1989, 2000-2003, 2005, 2009-2015, 2018-2022,
+   2025-2026 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/derives.h b/src/derives.h
index 900590079..a5d949d20 100644
--- a/src/derives.h
+++ b/src/derives.h
@@ -1,7 +1,7 @@
 /* Match rules with nonterminals for bison,
 
-   Copyright (C) 1984, 1989, 2000-2002, 2009-2015, 2018-2022 Free
-   Software Foundation, Inc.
+   Copyright (C) 1984, 1989, 2000-2002, 2009-2015, 2018-2022, 2025-2026
+   Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/files.c b/src/files.c
index 52fb7bc82..d0644a05b 100644
--- a/src/files.c
+++ b/src/files.c
@@ -1,7 +1,7 @@
 /* Open and close files for Bison.
 
-   Copyright (C) 1984, 1986, 1989, 1992, 2000-2015, 2018-2022 Free
-   Software Foundation, Inc.
+   Copyright (C) 1984, 1986, 1989, 1992, 2000-2015, 2018-2022, 2025-2026
+   Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
@@ -261,8 +261,9 @@ map_file_name (char const *filename)
 }
 
 static void
-prefix_map_free (struct prefix_map *p)
+prefix_map_free (void const *vp)
 {
+  struct prefix_map *p = deconst (vp);
   free (p->oldprefix);
   free (p->newprefix);
   free (p);
@@ -273,11 +274,8 @@ add_prefix_map (char const *oldprefix, char const *newprefix)
 {
   if (!prefix_maps)
     prefix_maps
-      = gl_list_create_empty (GL_ARRAY_LIST,
-                              /* equals */ NULL,
-                              /* hashcode */ NULL,
-                              (gl_listelement_dispose_fn) prefix_map_free,
-                              true);
+      = gl_list_create_empty (GL_ARRAY_LIST, NULL, NULL,
+                              prefix_map_free, true);
 
   struct prefix_map *p = xmalloc (sizeof (*p));
   p->oldprefix = xstrdup (oldprefix);
diff --git a/src/files.h b/src/files.h
index c2214b0aa..5165c22b6 100644
--- a/src/files.h
+++ b/src/files.h
@@ -1,7 +1,7 @@
 /* File names and variables for bison,
 
-   Copyright (C) 1984, 1989, 2000-2002, 2006-2007, 2009-2015, 2018-2022
-   Free Software Foundation, Inc.
+   Copyright (C) 1984, 1989, 2000-2002, 2006-2007, 2009-2015, 2018-2022,
+   2025-2026 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/fixits.c b/src/fixits.c
index 0605da418..5f467b19d 100644
--- a/src/fixits.c
+++ b/src/fixits.c
@@ -1,6 +1,6 @@
 /* Support for fixing grammar files.
 
-   Copyright (C) 2019-2022 Free Software Foundation, Inc.
+   Copyright (C) 2019-2022, 2025-2026 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
@@ -53,14 +53,17 @@ fixit_new (location const *loc, char const* fix)
 }
 
 static int
-fixit_cmp (const  fixit *a, const fixit *b)
+fixit_cmp (void const *va, void const *vb)
 {
+  fixit const *a = va;
+  fixit const *b = vb;
   return location_cmp (a->location, b->location);
 }
 
 static void
-fixit_free (fixit *f)
+fixit_free (void const *vf)
 {
+  fixit *f = deconst (vf);
   free (f->fix);
   free (f);
 }
@@ -84,13 +87,10 @@ void
 fixits_register (location const *loc, char const* fix)
 {
   if (!fixits)
-    fixits = gl_list_create_empty (GL_ARRAY_LIST,
-                                   /* equals */ NULL,
-                                   /* hashcode */ NULL,
-                                   (gl_listelement_dispose_fn) fixit_free,
-                                   true);
+    fixits = gl_list_create_empty (GL_ARRAY_LIST, NULL, NULL,
+                                   fixit_free, true);
   fixit *f = fixit_new (loc, fix);
-  gl_sortedlist_add (fixits, (gl_listelement_compar_fn) fixit_cmp, f);
+  gl_sortedlist_add (fixits, fixit_cmp, f);
   if (feature_flag & feature_fixit)
     fixit_print (f, stderr);
 }
diff --git a/src/fixits.h b/src/fixits.h
index 7ae292418..2e5a6b810 100644
--- a/src/fixits.h
+++ b/src/fixits.h
@@ -1,6 +1,6 @@
 /* Support for fixing grammar files.
 
-   Copyright (C) 2019-2022 Free Software Foundation, Inc.
+   Copyright (C) 2019-2022, 2025-2026 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/src/flex-scanner.h b/src/flex-scanner.h
index e4cec853f..a39d28e5c 100644
--- a/src/flex-scanner.h
+++ b/src/flex-scanner.h
@@ -1,7 +1,7 @@
 /* Common parts between scan-code.l, scan-gram.l, and scan-skel.l.
 
-   Copyright (C) 2006, 2009-2015, 2018-2022 Free Software Foundation,
-   Inc.
+   Copyright (C) 2006, 2009-2015, 2018-2022, 2025-2026 Free Software
+   Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/getargs.c b/src/getargs.c
index ad9ded9c6..35cee9d53 100644
--- a/src/getargs.c
+++ b/src/getargs.c
@@ -1,7 +1,7 @@
 /* Parse command line arguments for Bison.
 
-   Copyright (C) 1984, 1986, 1989, 1992, 2000-2015, 2018-2022 Free
-   Software Foundation, Inc.
+   Copyright (C) 1984, 1986, 1989, 1992, 2000-2015, 2018-2022, 2025-2026
+   Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
@@ -69,7 +69,7 @@ const char *skeleton = NULL;
 int language_prio = default_prio;
 struct bison_language const *language = &valid_languages[0];
 
-typedef int* (xargmatch_fn) (const char *context, const char *arg);
+typedef int const *(xargmatch_fn) (char const *context, char const *arg);
 
 void
 set_yacc (location loc)
@@ -164,7 +164,7 @@ flags_argmatch (const char *opt,
  */
 #define FLAGS_ARGMATCH(FlagName, Args, All)                             \
   flags_argmatch ("--" #FlagName,                                       \
-                  (xargmatch_fn*) argmatch_## FlagName ## _value,       \
+                  argmatch_ ## FlagName ## _value,                      \
                   argmatch_ ## FlagName ## _usage,                      \
                   All, &FlagName ## _flag, Args)
 
@@ -179,7 +179,7 @@ enum color
     color_auto
   };
 
-ARGMATCH_DEFINE_GROUP (color, enum color)
+ARGMATCH_DEFINE_GROUP (color, int)
 
 static const argmatch_color_doc argmatch_color_docs[] =
 {
@@ -215,7 +215,7 @@ const argmatch_color_group_type argmatch_color_group =
 | --report's handling.  |
 `----------------------*/
 
-ARGMATCH_DEFINE_GROUP (report, enum report)
+ARGMATCH_DEFINE_GROUP (report, int)
 
 static const argmatch_report_doc argmatch_report_docs[] =
 {
@@ -256,7 +256,7 @@ const argmatch_report_group_type argmatch_report_group =
 | --trace's handling.  |
 `---------------------*/
 
-ARGMATCH_DEFINE_GROUP (trace, enum trace)
+ARGMATCH_DEFINE_GROUP (trace, int)
 
 static const argmatch_trace_doc argmatch_trace_docs[] =
 {
@@ -319,7 +319,7 @@ const argmatch_trace_group_type argmatch_trace_group =
 | --feature's handling.  |
 `-----------------------*/
 
-ARGMATCH_DEFINE_GROUP (feature, enum feature)
+ARGMATCH_DEFINE_GROUP (feature, int)
 
 static const argmatch_feature_doc argmatch_feature_docs[] =
 {
@@ -422,12 +422,12 @@ Diagnostics:\n\
 Tuning the Parser:\n\
   -L, --language=LANGUAGE          specify the output programming language\n\
   -S, --skeleton=FILE              specify the skeleton to use\n\
-  -t, --debug                      instrument the parser for tracing\n\
+  -t, --debug                      instrument the parser for tracing;\n\
                                    same as '-Dparse.trace'\n\
       --locations                  enable location support\n\
   -D, --define=NAME[=VALUE]        similar to '%define NAME VALUE'\n\
   -F, --force-define=NAME[=VALUE]  override '%define NAME VALUE'\n\
-  -p, --name-prefix=PREFIX         prepend PREFIX to the external symbols\n\
+  -p, --name-prefix=PREFIX         prepend PREFIX to the external symbols;\n\
                                    deprecated by '-Dapi.prefix={PREFIX}'\n\
   -l, --no-lines                   don't generate '#line' directives\n\
   -k, --token-table                include a table of token names\n\
@@ -443,7 +443,7 @@ Output Files:\n\
       --report-file=FILE        write report to FILE\n\
   -v, --verbose                 same as '--report=state'\n\
   -b, --file-prefix=PREFIX      specify a PREFIX for output files\n\
-  -o, --output=FILE             leave output to FILE\n\
+  -o, --output=FILE             output to FILE\n\
   -g, --graph[=FILE]            also output a graph of the automaton\n\
       --html[=FILE]             also output an HTML report of the automaton\n\
   -x, --xml[=FILE]              also output an XML report of the automaton\n\
diff --git a/src/getargs.h b/src/getargs.h
index c34b9d884..0ac1bf87f 100644
--- a/src/getargs.h
+++ b/src/getargs.h
@@ -1,7 +1,7 @@
 /* Parse command line arguments for bison.
 
-   Copyright (C) 1984, 1986, 1989, 1992, 2000-2015, 2018-2022 Free
-   Software Foundation, Inc.
+   Copyright (C) 1984, 1986, 1989, 1992, 2000-2015, 2018-2022, 2025-2026
+   Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/glyphs.c b/src/glyphs.c
index cdfe6f29c..0b106ef1f 100644
--- a/src/glyphs.c
+++ b/src/glyphs.c
@@ -1,6 +1,6 @@
 /* Graphical symbols.
 
-   Copyright (C) 2020-2022 Free Software Foundation, Inc.
+   Copyright (C) 2020-2022, 2025-2026 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/glyphs.h b/src/glyphs.h
index 9c77b8890..78cbf7373 100644
--- a/src/glyphs.h
+++ b/src/glyphs.h
@@ -1,6 +1,6 @@
 /* Graphical symbols.
 
-   Copyright (C) 2020-2022 Free Software Foundation, Inc.
+   Copyright (C) 2020-2022, 2025-2026 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/gram.c b/src/gram.c
index 33474ead9..8e55f22bd 100644
--- a/src/gram.c
+++ b/src/gram.c
@@ -1,7 +1,7 @@
 /* Allocate input grammar variables for Bison.
 
-   Copyright (C) 1984, 1986, 1989, 2001-2003, 2005-2015, 2018-2022 Free
-   Software Foundation, Inc.
+   Copyright (C) 1984, 1986, 1989, 2001-2003, 2005-2015, 2018-2022,
+   2025-2026 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/gram.h b/src/gram.h
index 06ab23db0..f9ae21008 100644
--- a/src/gram.h
+++ b/src/gram.h
@@ -1,7 +1,7 @@
 /* Data definitions for internal representation of Bison's input.
 
-   Copyright (C) 1984, 1986, 1989, 1992, 2001-2007, 2009-2015, 2018-2022
-   Free Software Foundation, Inc.
+   Copyright (C) 1984, 1986, 1989, 1992, 2001-2007, 2009-2015,
+   2018-2022, 2025-2026 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/graphviz.c b/src/graphviz.c
index c59aa221b..f5104eeb9 100644
--- a/src/graphviz.c
+++ b/src/graphviz.c
@@ -1,7 +1,7 @@
 /* Output Graphviz specification of a state machine generated by Bison.
 
-   Copyright (C) 2006-2007, 2009-2015, 2018-2022 Free Software
-   Foundation, Inc.
+   Copyright (C) 2006-2007, 2009-2015, 2018-2022, 2025-2026 Free
+   Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/graphviz.h b/src/graphviz.h
index 2ca89cbf1..c9ff3608f 100644
--- a/src/graphviz.h
+++ b/src/graphviz.h
@@ -1,7 +1,7 @@
 /* Output Graphviz specification of a state machine generated by Bison.
 
-   Copyright (C) 2006, 2010-2015, 2018-2022 Free Software Foundation,
-   Inc.
+   Copyright (C) 2006, 2010-2015, 2018-2022, 2025-2026 Free Software
+   Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/ielr.c b/src/ielr.c
index 3c5ec695f..879f869d1 100644
--- a/src/ielr.c
+++ b/src/ielr.c
@@ -1,6 +1,7 @@
 /* IELR main implementation.
 
-   Copyright (C) 2009-2015, 2018-2022 Free Software Foundation, Inc.
+   Copyright (C) 2009-2015, 2018-2022, 2025-2026 Free Software
+   Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/ielr.h b/src/ielr.h
index 0fa8cb252..c563f5383 100644
--- a/src/ielr.h
+++ b/src/ielr.h
@@ -1,6 +1,7 @@
 /* IELR main implementation.
 
-   Copyright (C) 2009-2015, 2018-2022 Free Software Foundation, Inc.
+   Copyright (C) 2009-2015, 2018-2022, 2025-2026 Free Software
+   Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/lalr.c b/src/lalr.c
index 83f0345e5..f1e4de18a 100644
--- a/src/lalr.c
+++ b/src/lalr.c
@@ -1,7 +1,7 @@
 /* Compute lookahead criteria for Bison.
 
-   Copyright (C) 1984, 1986, 1989, 2000-2015, 2018-2022 Free Software
-   Foundation, Inc.
+   Copyright (C) 1984, 1986, 1989, 2000-2015, 2018-2022, 2025-2026 Free
+   Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/lalr.h b/src/lalr.h
index 765e5c933..4b9630ab4 100644
--- a/src/lalr.h
+++ b/src/lalr.h
@@ -1,7 +1,7 @@
 /* Compute lookahead criteria for bison,
 
    Copyright (C) 1984, 1986, 1989, 2000, 2002, 2004, 2006-2007,
-   2009-2015, 2018-2022 Free Software Foundation, Inc.
+   2009-2015, 2018-2022, 2025-2026 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/local.mk b/src/local.mk
index 6051723ba..cbd538a66 100644
--- a/src/local.mk
+++ b/src/local.mk
@@ -1,4 +1,5 @@
-## Copyright (C) 2001-2015, 2018-2022 Free Software Foundation, Inc.
+## Copyright (C) 2001-2015, 2018-2022, 2025-2026 Free Software
+## Foundation, Inc.
 ##
 ## This program is free software: you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
diff --git a/src/location.c b/src/location.c
index 0f56bd39d..9a5d56652 100644
--- a/src/location.c
+++ b/src/location.c
@@ -1,7 +1,7 @@
 /* Locations for Bison
 
-   Copyright (C) 2002, 2005-2015, 2018-2022 Free Software Foundation,
-   Inc.
+   Copyright (C) 2002, 2005-2015, 2018-2022, 2025-2026 Free Software
+   Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/location.h b/src/location.h
index d63f352fe..5e7e8711b 100644
--- a/src/location.h
+++ b/src/location.h
@@ -1,7 +1,7 @@
 /* Locations for Bison
 
-   Copyright (C) 2002, 2004-2015, 2018-2022 Free Software Foundation,
-   Inc.
+   Copyright (C) 2002, 2004-2015, 2018-2022, 2025-2026 Free Software
+   Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/lr0.c b/src/lr0.c
index b39388843..ff978c048 100644
--- a/src/lr0.c
+++ b/src/lr0.c
@@ -1,7 +1,7 @@
 /* Generate the LR(0) parser states for Bison.
 
-   Copyright (C) 1984, 1986, 1989, 2000-2002, 2004-2015, 2018-2022 Free
-   Software Foundation, Inc.
+   Copyright (C) 1984, 1986, 1989, 2000-2002, 2004-2015, 2018-2022,
+   2025-2026 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/lr0.h b/src/lr0.h
index 4c2983347..36f6b4178 100644
--- a/src/lr0.h
+++ b/src/lr0.h
@@ -1,7 +1,7 @@
 /* Generate the LR(0) parser states for Bison.
 
-   Copyright (C) 1984, 1986, 1989, 2000-2002, 2009-2015, 2018-2022 Free
-   Software Foundation, Inc.
+   Copyright (C) 1984, 1986, 1989, 2000-2002, 2009-2015, 2018-2022,
+   2025-2026 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/lssi.c b/src/lssi.c
index 79bbba182..8aa8431bd 100644
--- a/src/lssi.c
+++ b/src/lssi.c
@@ -1,6 +1,6 @@
 /* Lookahead sensitive state item searches for counterexample generation
 
-   Copyright (C) 2020-2022 Free Software Foundation, Inc.
+   Copyright (C) 2020-2022, 2025-2026 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
@@ -50,8 +50,9 @@ new_lssi (state_item_number si, lssi *p, bitset l, bool free_l)
 }
 
 static void
-lssi_free (lssi *sn)
+lssi_free (void *vsn)
 {
+  lssi *sn = vsn;
   if (sn == NULL)
     return;
   if (sn->free_lookahead)
@@ -60,8 +61,9 @@ lssi_free (lssi *sn)
 }
 
 static size_t
-lssi_hasher (lssi *sn, size_t max)
+lssi_hasher (void const *vsn, size_t max)
 {
+  lssi const *sn = vsn;
   size_t hash = sn->si;
   bitset_iterator biter;
   symbol_number syn;
@@ -71,8 +73,10 @@ lssi_hasher (lssi *sn, size_t max)
 }
 
 static bool
-lssi_comparator (lssi *s1, lssi *s2)
+lssi_comparator (void const *vs1, void const *vs2)
 {
+  lssi const *s1 = vs1;
+  lssi const *s2 = vs2;
   if (s1->si == s2->si)
     {
       if (s1->lookahead == s2->lookahead)
@@ -154,11 +158,8 @@ state_item_list
 shortest_path_from_start (state_item_number target, symbol_number next_sym)
 {
   bitset eligible = eligible_state_items (&state_items[target]);
-  Hash_table *visited = hash_initialize (32,
-                                         NULL,
-                                         (Hash_hasher) lssi_hasher,
-                                         (Hash_comparator) lssi_comparator,
-                                         (Hash_data_freer) lssi_free);
+  Hash_table *visited = hash_initialize (32, NULL, lssi_hasher,
+                                         lssi_comparator, lssi_free);
   bitset il = bitset_create (nsyms, BITSET_FIXED);
   bitset_set (il, 0);
   lssi *init = new_lssi (0, NULL, il, true);
diff --git a/src/lssi.h b/src/lssi.h
index e2cc25e8f..c7a64e115 100644
--- a/src/lssi.h
+++ b/src/lssi.h
@@ -1,6 +1,6 @@
 /* Lookahead sensitive state item searches for counterexample generation
 
-   Copyright (C) 2020-2022 Free Software Foundation, Inc.
+   Copyright (C) 2020-2022, 2025-2026 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/main.c b/src/main.c
index 7f2519c9e..82e958684 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1,7 +1,7 @@
 /* Top level entry point of Bison.
 
    Copyright (C) 1984, 1986, 1989, 1992, 1995, 2000-2002, 2004-2015,
-   2018-2022 Free Software Foundation, Inc.
+   2018-2022, 2025-2026 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/muscle-tab.c b/src/muscle-tab.c
index f4d84d6ab..41a7b133d 100644
--- a/src/muscle-tab.c
+++ b/src/muscle-tab.c
@@ -1,6 +1,7 @@
 /* Muscle table manager for Bison.
 
-   Copyright (C) 2001-2015, 2018-2022 Free Software Foundation, Inc.
+   Copyright (C) 2001-2015, 2018-2022, 2025-2026 Free Software
+   Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/muscle-tab.h b/src/muscle-tab.h
index 15254a62a..e251756cf 100644
--- a/src/muscle-tab.h
+++ b/src/muscle-tab.h
@@ -1,7 +1,7 @@
 /* Muscle table manager for Bison,
 
-   Copyright (C) 2001-2003, 2006-2015, 2018-2022 Free Software
-   Foundation, Inc.
+   Copyright (C) 2001-2003, 2006-2015, 2018-2022, 2025-2026 Free
+   Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/named-ref.c b/src/named-ref.c
index f1b951fcb..8719b8938 100644
--- a/src/named-ref.c
+++ b/src/named-ref.c
@@ -1,6 +1,7 @@
 /* Named symbol references for Bison
 
-   Copyright (C) 2009-2015, 2018-2022 Free Software Foundation, Inc.
+   Copyright (C) 2009-2015, 2018-2022, 2025-2026 Free Software
+   Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/named-ref.h b/src/named-ref.h
index 7d3a4ea51..560e69ab2 100644
--- a/src/named-ref.h
+++ b/src/named-ref.h
@@ -1,6 +1,7 @@
 /* Named symbol references for Bison
 
-   Copyright (C) 2009-2015, 2018-2022 Free Software Foundation, Inc.
+   Copyright (C) 2009-2015, 2018-2022, 2025-2026 Free Software
+   Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/nullable.c b/src/nullable.c
index 08ebd2be3..527b4f90c 100644
--- a/src/nullable.c
+++ b/src/nullable.c
@@ -1,7 +1,7 @@
 /* Calculate which nonterminals can expand into the null string for Bison.
 
-   Copyright (C) 1984, 1989, 2000-2006, 2009-2015, 2018-2022 Free
-   Software Foundation, Inc.
+   Copyright (C) 1984, 1989, 2000-2006, 2009-2015, 2018-2022, 2025-2026
+   Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/nullable.h b/src/nullable.h
index 759bf979f..3238c4696 100644
--- a/src/nullable.h
+++ b/src/nullable.h
@@ -1,7 +1,7 @@
 /* Part of the bison parser generator,
 
-   Copyright (C) 2000, 2002, 2009-2015, 2018-2022 Free Software
-   Foundation, Inc.
+   Copyright (C) 2000, 2002, 2009-2015, 2018-2022, 2025-2026 Free
+   Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/output.c b/src/output.c
index 5e7ef15e5..5e452a77c 100644
--- a/src/output.c
+++ b/src/output.c
@@ -1,7 +1,7 @@
 /* Output the generated parsing program for Bison.
 
-   Copyright (C) 1984, 1986, 1989, 1992, 2000-2015, 2018-2022 Free
-   Software Foundation, Inc.
+   Copyright (C) 1984, 1986, 1989, 1992, 2000-2015, 2018-2022, 2025-2026
+   Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
@@ -808,6 +808,7 @@ output_skeleton (void)
       }
 
     pid = create_pipe_bidi ("m4", m4, argv,
+                            /* dll_dirs */ NULL,
                             /* directory */ NULL,
                             /* null_stderr */ false,
                             /* slave_process */ true,
diff --git a/src/output.h b/src/output.h
index bf4f4aa51..0dadd1a3b 100644
--- a/src/output.h
+++ b/src/output.h
@@ -1,7 +1,7 @@
 /* Output the generated parsing program for bison,
 
-   Copyright (C) 2000-2003, 2006-2007, 2009-2015, 2018-2022 Free
-   Software Foundation, Inc.
+   Copyright (C) 2000-2003, 2006-2007, 2009-2015, 2018-2022, 2025-2026
+   Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/parse-gram.c b/src/parse-gram.c
index b6ac083e7..9ebc1c418 100644
--- a/src/parse-gram.c
+++ b/src/parse-gram.c
@@ -2,8 +2,8 @@
 
 /* Bison implementation for Yacc-like parsers in C
 
-   Copyright (C) 1984, 1989-1990, 2000-2015, 2018-2022 Free Software Foundation,
-   Inc.
+   Copyright (C) 1984, 1989-1990, 2000-2015, 2018-2022, 2025-2026 Free
+   Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -2945,11 +2945,11 @@ add_param (param_type type, char *decl, location loc)
     /* Strip the surrounding '{' and '}', and any blanks just inside
        the braces.  */
     --p;
-    while (c_isspace ((unsigned char) *p))
+    while (c_isspace (*p))
       --p;
     p[1] = '\0';
     ++decl;
-    while (c_isspace ((unsigned char) *decl))
+    while (c_isspace (*decl))
       ++decl;
   }
 
diff --git a/src/parse-gram.y b/src/parse-gram.y
index 3006f54c8..d38b16cd2 100644
--- a/src/parse-gram.y
+++ b/src/parse-gram.y
@@ -1,6 +1,7 @@
 /* Bison Grammar Parser                             -*- C -*-
 
-   Copyright (C) 2002-2015, 2018-2022 Free Software Foundation, Inc.
+   Copyright (C) 2002-2015, 2018-2022, 2025-2026 Free Software
+   Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
@@ -928,11 +929,11 @@ add_param (param_type type, char *decl, location loc)
     /* Strip the surrounding '{' and '}', and any blanks just inside
        the braces.  */
     --p;
-    while (c_isspace ((unsigned char) *p))
+    while (c_isspace (*p))
       --p;
     p[1] = '\0';
     ++decl;
-    while (c_isspace ((unsigned char) *decl))
+    while (c_isspace (*decl))
       ++decl;
   }
 
diff --git a/src/parse-simulation.c b/src/parse-simulation.c
index 9e1f66dfa..55013acb4 100644
--- a/src/parse-simulation.c
+++ b/src/parse-simulation.c
@@ -1,6 +1,6 @@
 /* Parser simulator for unifying counterexample search
 
-   Copyright (C) 2020-2022 Free Software Foundation, Inc.
+   Copyright (C) 2020-2022, 2025-2026 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
@@ -194,8 +194,9 @@ parse_state_free_contents_early (parse_state *ps)
 }
 
 void
-free_parse_state (parse_state *original_ps)
+free_parse_state (void const *voriginal_ps)
 {
+  parse_state *original_ps = deconst (voriginal_ps);
   bool free_contents = true;
   parse_state *parent_ps = NULL;
   for (parse_state *ps = original_ps; ps && free_contents; ps = parent_ps)
@@ -311,8 +312,7 @@ static parse_state_list
 parse_state_list_new (void)
 {
   return gl_list_create_empty (GL_LINKED_LIST, NULL, NULL,
-                               (gl_listelement_dispose_fn)free_parse_state,
-                               true);
+                               free_parse_state, true);
 }
 
 static void
@@ -322,6 +322,13 @@ parse_state_list_append (parse_state_list pl, parse_state *ps)
   gl_list_add_last (pl, ps);
 }
 
+static void
+vc_derivation_list_append (derivation_list dl, void const *vcd)
+{
+  derivation *d = deconst (vcd);
+  return derivation_list_append (dl, d);
+}
+
 // Emulates a reduction on a parse state by popping some amount of
 // derivations and state_items off of the parse_state and returning
 // the result in ret. Returns the derivation of what's popped.
@@ -351,7 +358,7 @@ parser_pop (parse_state *ps, int deriv_index,
   list_flatten_and_split (chunks, ret_chunks, si_index, 2,
                           list_add_last);
   list_flatten_and_split (chunks + 2, ret_chunks + 2, deriv_index, 2,
-                          (chunk_append_fn)derivation_list_append);
+                          vc_derivation_list_append);
   size_t s_size = gl_list_size (ret->state_items.contents);
   ret->state_items.total_size = s_size;
   if (s_size > 0)
diff --git a/src/parse-simulation.h b/src/parse-simulation.h
index ac746cd63..82ad75290 100644
--- a/src/parse-simulation.h
+++ b/src/parse-simulation.h
@@ -1,6 +1,6 @@
 /* Parser simulator for unifying counterexample search
 
-   Copyright (C) 2020-2022 Free Software Foundation, Inc.
+   Copyright (C) 2020-2022, 2025-2026 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
@@ -99,7 +99,7 @@ void parse_state_retain (parse_state *ps);
  * when its reference count reaches 1. This is used to
  * free memory while the parse state is in a hash set. */
 void parse_state_free_contents_early (parse_state *ps);
-void free_parse_state (parse_state *ps);
+void free_parse_state (void const *ps);
 
 /* counts the amount of shift and production steps in this parse state */
 void parse_state_completed_steps (const parse_state *ps, int *shifts, int *productions);
diff --git a/src/print-graph.c b/src/print-graph.c
index b8e7b42c9..408caa2d2 100644
--- a/src/print-graph.c
+++ b/src/print-graph.c
@@ -1,7 +1,7 @@
 /* Output a graph of the generated parser, for Bison.
 
-   Copyright (C) 2001-2007, 2009-2015, 2018-2022 Free Software
-   Foundation, Inc.
+   Copyright (C) 2001-2007, 2009-2015, 2018-2022, 2025-2026 Free
+   Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/print-graph.h b/src/print-graph.h
index 0a496fac3..8f2d8a318 100644
--- a/src/print-graph.h
+++ b/src/print-graph.h
@@ -1,7 +1,7 @@
 /* Output a graph of the generated parser, for Bison.
 
-   Copyright (C) 2000, 2006, 2009-2015, 2018-2022 Free Software
-   Foundation, Inc.
+   Copyright (C) 2000, 2006, 2009-2015, 2018-2022, 2025-2026 Free
+   Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/print-xml.c b/src/print-xml.c
index 7db0f213f..8da6da0d4 100644
--- a/src/print-xml.c
+++ b/src/print-xml.c
@@ -1,7 +1,7 @@
 /* Print an xml on generated parser, for Bison,
 
-   Copyright (C) 2007, 2009-2015, 2018-2022 Free Software Foundation,
-   Inc.
+   Copyright (C) 2007, 2009-2015, 2018-2022, 2025-2026 Free Software
+   Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
@@ -565,6 +565,7 @@ print_html (void)
   int status
     = execute (argv[0],
                argv[0], argv,
+               /* dll_dirs */ NULL,
                /* directory */ NULL,
                /* ignore_sigpipe */ false,
                /* null_stdin, null_stdout, null_stderr */ true, true, true,
diff --git a/src/print-xml.h b/src/print-xml.h
index 8bb78359e..e70309da9 100644
--- a/src/print-xml.h
+++ b/src/print-xml.h
@@ -1,7 +1,7 @@
 /* Output an xml of the generated parser, for Bison.
 
-   Copyright (C) 2007, 2009-2015, 2018-2022 Free Software Foundation,
-   Inc.
+   Copyright (C) 2007, 2009-2015, 2018-2022, 2025-2026 Free Software
+   Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/print.c b/src/print.c
index b7e2ebedf..40c00ef7d 100644
--- a/src/print.c
+++ b/src/print.c
@@ -1,7 +1,7 @@
 /* Print information on generated parser, for bison,
 
-   Copyright (C) 1984, 1986, 1989, 2000-2005, 2007, 2009-2015, 2018-2022
-   Free Software Foundation, Inc.
+   Copyright (C) 1984, 1986, 1989, 2000-2005, 2007, 2009-2015,
+   2018-2022, 2025-2026 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/print.h b/src/print.h
index b00021b0c..2c8462df5 100644
--- a/src/print.h
+++ b/src/print.h
@@ -1,7 +1,7 @@
 /* Print information on generated parser, for bison,
 
-   Copyright (C) 2000, 2009-2015, 2018-2022 Free Software Foundation,
-   Inc.
+   Copyright (C) 2000, 2009-2015, 2018-2022, 2025-2026 Free Software
+   Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/reader.c b/src/reader.c
index 3d60ab36d..862d7293a 100644
--- a/src/reader.c
+++ b/src/reader.c
@@ -1,7 +1,7 @@
 /* Input parser for Bison
 
    Copyright (C) 1984, 1986, 1989, 1992, 1998, 2000-2003, 2005-2007,
-   2009-2015, 2018-2022 Free Software Foundation, Inc.
+   2009-2015, 2018-2022, 2025-2026 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/reader.h b/src/reader.h
index 1e9b6dea3..76ffee550 100644
--- a/src/reader.h
+++ b/src/reader.h
@@ -1,7 +1,7 @@
 /* Input parser for Bison
 
-   Copyright (C) 2000-2003, 2005-2007, 2009-2015, 2018-2022 Free
-   Software Foundation, Inc.
+   Copyright (C) 2000-2003, 2005-2007, 2009-2015, 2018-2022, 2025-2026
+   Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/reduce.c b/src/reduce.c
index b68b2a305..aeecc4ba8 100644
--- a/src/reduce.c
+++ b/src/reduce.c
@@ -1,7 +1,7 @@
 /* Grammar reduction for Bison.
 
-   Copyright (C) 1988-1989, 2000-2003, 2005-2015, 2018-2022 Free
-   Software Foundation, Inc.
+   Copyright (C) 1988-1989, 2000-2003, 2005-2015, 2018-2022, 2025-2026
+   Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/reduce.h b/src/reduce.h
index d86a3aa6e..2a1d5ef2e 100644
--- a/src/reduce.h
+++ b/src/reduce.h
@@ -1,7 +1,7 @@
 /* Grammar reduction for Bison.
 
-   Copyright (C) 2000-2002, 2007, 2009-2015, 2018-2022 Free Software
-   Foundation, Inc.
+   Copyright (C) 2000-2002, 2007, 2009-2015, 2018-2022, 2025-2026 Free
+   Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/relation.c b/src/relation.c
index ae4d3c516..fadc36b37 100644
--- a/src/relation.c
+++ b/src/relation.c
@@ -1,7 +1,7 @@
 /* Binary relations.
 
-   Copyright (C) 2002, 2004-2005, 2009-2015, 2018-2022 Free Software
-   Foundation, Inc.
+   Copyright (C) 2002, 2004-2005, 2009-2015, 2018-2022, 2025-2026 Free
+   Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/relation.h b/src/relation.h
index 4e78a8600..61c11e148 100644
--- a/src/relation.h
+++ b/src/relation.h
@@ -1,7 +1,7 @@
 /* Binary relations.
 
-   Copyright (C) 2002, 2004, 2009-2015, 2018-2022 Free Software
-   Foundation, Inc.
+   Copyright (C) 2002, 2004, 2009-2015, 2018-2022, 2025-2026 Free
+   Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/scan-code.h b/src/scan-code.h
index 2d6537ab0..2a091aa0c 100644
--- a/src/scan-code.h
+++ b/src/scan-code.h
@@ -1,7 +1,7 @@
 /* Bison code properties structure and scanner.
 
-   Copyright (C) 2006-2007, 2009-2015, 2018-2022 Free Software
-   Foundation, Inc.
+   Copyright (C) 2006-2007, 2009-2015, 2018-2022, 2025-2026 Free
+   Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/scan-code.l b/src/scan-code.l
index b6b8fa4df..c8b5b4473 100644
--- a/src/scan-code.l
+++ b/src/scan-code.l
@@ -1,6 +1,7 @@
 /* Bison Action Scanner                             -*- C -*-
 
-   Copyright (C) 2006-2015, 2018-2022 Free Software Foundation, Inc.
+   Copyright (C) 2006-2015, 2018-2022, 2025-2026 Free Software
+   Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/scan-gram.h b/src/scan-gram.h
index 6c6c74de7..1a194f6ad 100644
--- a/src/scan-gram.h
+++ b/src/scan-gram.h
@@ -1,7 +1,7 @@
 /* Bison Grammar Scanner
 
-   Copyright (C) 2006-2007, 2009-2015, 2018-2022 Free Software
-   Foundation, Inc.
+   Copyright (C) 2006-2007, 2009-2015, 2018-2022, 2025-2026 Free
+   Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/scan-gram.l b/src/scan-gram.l
index 3926a4aa2..3f80b7c8a 100644
--- a/src/scan-gram.l
+++ b/src/scan-gram.l
@@ -1,6 +1,7 @@
 /* Bison Grammar Scanner                             -*- C -*-
 
-   Copyright (C) 2002-2015, 2018-2022 Free Software Foundation, Inc.
+   Copyright (C) 2002-2015, 2018-2022, 2025-2026 Free Software
+   Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
@@ -683,7 +684,7 @@ eqopt    ({sp}=)?
   \\(.|{eol})      {
     char const *p = yytext + 1;
     /* Quote only if escaping won't make the character visible.  */
-    if (c_isspace ((unsigned char) *p) && c_isprint ((unsigned char) *p))
+    if (c_isspace (*p) && c_isprint (*p))
       p = quote (p);
     else
       p = quotearg_style_mem (escape_quoting_style, p, 1);
diff --git a/src/scan-skel.h b/src/scan-skel.h
index 62042865b..b04acf998 100644
--- a/src/scan-skel.h
+++ b/src/scan-skel.h
@@ -1,7 +1,7 @@
 /* Scan Bison Skeletons.
 
-   Copyright (C) 2005-2007, 2009-2015, 2018-2022 Free Software
-   Foundation, Inc.
+   Copyright (C) 2005-2007, 2009-2015, 2018-2022, 2025-2026 Free
+   Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/scan-skel.l b/src/scan-skel.l
index d647c079f..fc611abca 100644
--- a/src/scan-skel.l
+++ b/src/scan-skel.l
@@ -1,6 +1,7 @@
 /* Scan Bison Skeletons.                                       -*- C -*-
 
-   Copyright (C) 2001-2015, 2018-2022 Free Software Foundation, Inc.
+   Copyright (C) 2001-2015, 2018-2022, 2025-2026 Free Software
+   Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/state-item.c b/src/state-item.c
index cc1602ccd..ff53a8300 100644
--- a/src/state-item.c
+++ b/src/state-item.c
@@ -1,6 +1,6 @@
 /* Counterexample Generation Search Nodes
 
-   Copyright (C) 2020-2022 Free Software Foundation, Inc.
+   Copyright (C) 2020-2022, 2025-2026 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
@@ -44,20 +44,24 @@ typedef struct
 } hash_pair;
 
 static size_t
-hash_pair_hasher (const hash_pair *sl, size_t max)
+hash_pair_hasher (void const *vsl, size_t max)
 {
+  hash_pair const *sl = vsl;
   return sl->key % max;
 }
 
 static bool
-hash_pair_comparator (const hash_pair *l, const hash_pair *r)
+hash_pair_comparator (void const *vl, void const *vr)
 {
+  hash_pair const *l = vl;
+  hash_pair const *r = vr;
   return l->key == r->key;
 }
 
 static void
-hash_pair_free (hash_pair *hp)
+hash_pair_free (void *vhp)
 {
+  hash_pair *hp = vhp;
   bitset_free (hp->l);
   free (hp);
 }
@@ -65,11 +69,8 @@ hash_pair_free (hash_pair *hp)
 static Hash_table *
 hash_pair_table_create (int size)
 {
-  return hash_xinitialize (size,
-                           NULL,
-                           (Hash_hasher) hash_pair_hasher,
-                           (Hash_comparator) hash_pair_comparator,
-                           (Hash_data_freer) hash_pair_free);
+  return hash_xinitialize (size, NULL, hash_pair_hasher,
+                           hash_pair_comparator, hash_pair_free);
 }
 
 static bitset
diff --git a/src/state-item.h b/src/state-item.h
index a1f8ffde1..d13b8266d 100644
--- a/src/state-item.h
+++ b/src/state-item.h
@@ -1,6 +1,6 @@
 /* Counterexample Generation Search Nodes
 
-   Copyright (C) 2020-2022 Free Software Foundation, Inc.
+   Copyright (C) 2020-2022, 2025-2026 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/state.c b/src/state.c
index 9b678ec5a..beb730ef3 100644
--- a/src/state.c
+++ b/src/state.c
@@ -1,7 +1,7 @@
 /* Type definitions for the finite state machine for Bison.
 
-   Copyright (C) 2001-2007, 2009-2015, 2018-2022 Free Software
-   Foundation, Inc.
+   Copyright (C) 2001-2007, 2009-2015, 2018-2022, 2025-2026 Free
+   Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/state.h b/src/state.h
index 657838f07..92ca0609f 100644
--- a/src/state.h
+++ b/src/state.h
@@ -1,7 +1,7 @@
 /* Type definitions for the finite state machine for Bison.
 
-   Copyright (C) 1984, 1989, 2000-2004, 2007, 2009-2015, 2018-2022 Free
-   Software Foundation, Inc.
+   Copyright (C) 1984, 1989, 2000-2004, 2007, 2009-2015, 2018-2022,
+   2025-2026 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/strversion.c b/src/strversion.c
index 5cc0ceec7..b1f390645 100644
--- a/src/strversion.c
+++ b/src/strversion.c
@@ -1,6 +1,6 @@
 /* Convert version string to int.
 
-   Copyright (C) 2020-2022 Free Software Foundation, Inc.
+   Copyright (C) 2020-2022, 2025-2026 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/strversion.h b/src/strversion.h
index f61371e46..fa6823a24 100644
--- a/src/strversion.h
+++ b/src/strversion.h
@@ -1,6 +1,6 @@
 /* Convert version string to int.
 
-   Copyright (C) 2020-2022 Free Software Foundation, Inc.
+   Copyright (C) 2020-2022, 2025-2026 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/symlist.c b/src/symlist.c
index 5485fa73e..f350aa286 100644
--- a/src/symlist.c
+++ b/src/symlist.c
@@ -1,7 +1,7 @@
 /* Lists of symbols for Bison
 
-   Copyright (C) 2002, 2005-2007, 2009-2015, 2018-2022 Free Software
-   Foundation, Inc.
+   Copyright (C) 2002, 2005-2007, 2009-2015, 2018-2022, 2025-2026 Free
+   Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/symlist.h b/src/symlist.h
index c9e29651e..2db8ced16 100644
--- a/src/symlist.h
+++ b/src/symlist.h
@@ -1,7 +1,7 @@
 /* Lists of symbols for Bison
 
-   Copyright (C) 2002, 2005-2007, 2009-2015, 2018-2022 Free Software
-   Foundation, Inc.
+   Copyright (C) 2002, 2005-2007, 2009-2015, 2018-2022, 2025-2026 Free
+   Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/symtab.c b/src/symtab.c
index 0956f54dd..a3bee321f 100644
--- a/src/symtab.c
+++ b/src/symtab.c
@@ -1,7 +1,7 @@
 /* Symbol table manager for Bison.
 
-   Copyright (C) 1984, 1989, 2000-2002, 2004-2015, 2018-2022 Free
-   Software Foundation, Inc.
+   Copyright (C) 1984, 1989, 2000-2002, 2004-2015, 2018-2022, 2025-2026
+   Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
@@ -284,7 +284,7 @@ symbol_print (symbol const *s, FILE *f)
 static bool
 is_identifier (uniqstr s)
 {
-  static char const alphanum[26 + 26 + 1 + 10] =
+  static char const alphanum[26 + 26 + 1 + 10] ATTRIBUTE_NONSTRING =
     "abcdefghijklmnopqrstuvwxyz"
     "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
     "_"
diff --git a/src/symtab.h b/src/symtab.h
index 1a1b24353..0fdca3bdf 100644
--- a/src/symtab.h
+++ b/src/symtab.h
@@ -1,7 +1,7 @@
 /* Definitions for symtab.c and callers, part of Bison.
 
-   Copyright (C) 1984, 1989, 1992, 2000-2002, 2004-2015, 2018-2022 Free
-   Software Foundation, Inc.
+   Copyright (C) 1984, 1989, 1992, 2000-2002, 2004-2015, 2018-2022,
+   2025-2026 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/system.h b/src/system.h
index fd30926b4..2df3965dc 100644
--- a/src/system.h
+++ b/src/system.h
@@ -1,7 +1,7 @@
 /* System-dependent definitions for Bison.
 
-   Copyright (C) 2000-2007, 2009-2015, 2018-2022 Free Software
-   Foundation, Inc.
+   Copyright (C) 2000-2007, 2009-2015, 2018-2022, 2025-2026 Free
+   Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -308,4 +308,13 @@ obstack_escape (struct obstack* obs, const char *cp)
       }                                         \
   } while (0)
 
+/* Gnulib generic list functions sometimes want args to be void const *.
+   We sometimes want void *, for 'free', or possibly because we plan
+   to cheat and modify the storage.  Cast to satisfy C's static checking.  */
+static inline void *
+deconst (void const *p)
+{
+  return (void *) p;
+}
+
 #endif  /* ! BISON_SYSTEM_H */
diff --git a/src/tables.c b/src/tables.c
index 72b9d7ef9..97d2ccabe 100644
--- a/src/tables.c
+++ b/src/tables.c
@@ -1,7 +1,7 @@
 /* Output the generated parsing program for Bison.
 
-   Copyright (C) 1984, 1986, 1989, 1992, 2000-2006, 2009-2015, 2018-2022
-   Free Software Foundation, Inc.
+   Copyright (C) 1984, 1986, 1989, 1992, 2000-2006, 2009-2015,
+   2018-2022, 2025-2026 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/tables.h b/src/tables.h
index 111d9782d..26cba3f49 100644
--- a/src/tables.h
+++ b/src/tables.h
@@ -1,7 +1,7 @@
 /* Prepare the LALR and GLR parser tables.
 
-   Copyright (C) 2002, 2004, 2009-2015, 2018-2022 Free Software
-   Foundation, Inc.
+   Copyright (C) 2002, 2004, 2009-2015, 2018-2022, 2025-2026 Free
+   Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/uniqstr.c b/src/uniqstr.c
index f6c6147e6..86a6bd4bf 100644
--- a/src/uniqstr.c
+++ b/src/uniqstr.c
@@ -1,7 +1,7 @@
 /* Keep a unique copy of strings.
 
-   Copyright (C) 2002-2005, 2009-2015, 2018-2022 Free Software
-   Foundation, Inc.
+   Copyright (C) 2002-2005, 2009-2015, 2018-2022, 2025-2026 Free
+   Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/src/uniqstr.h b/src/uniqstr.h
index 55b72e1b1..b8c88fcc8 100644
--- a/src/uniqstr.h
+++ b/src/uniqstr.h
@@ -1,7 +1,7 @@
 /* Keeping a unique copy of strings.
 
-   Copyright (C) 2002-2003, 2008-2015, 2018-2022 Free Software
-   Foundation, Inc.
+   Copyright (C) 2002-2003, 2008-2015, 2018-2022, 2025-2026 Free
+   Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/submodules/autoconf b/submodules/autoconf
index 66fdaea3c..13698e255 160000
--- a/submodules/autoconf
+++ b/submodules/autoconf
@@ -1 +1 @@
-Subproject commit 66fdaea3cfb4e758212c1891913e9a59441d49af
+Subproject commit 13698e25548f0a303118128749afbd2101131add
diff --git a/tests/actions.at b/tests/actions.at
index 603153e7d..990c72054 100644
--- a/tests/actions.at
+++ b/tests/actions.at
@@ -1,6 +1,7 @@
 # Executing Actions.                               -*- Autotest -*-
 
-# Copyright (C) 2001-2015, 2018-2022 Free Software Foundation, Inc.
+# Copyright (C) 2001-2015, 2018-2022, 2025-2026 Free Software
+# Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/tests/atlocal.in b/tests/atlocal.in
index e28cbc587..2174d187e 100644
--- a/tests/atlocal.in
+++ b/tests/atlocal.in
@@ -1,7 +1,8 @@
 # @configure_input@                                     -*- shell-script -*-
 # Configurable variable values for Bison test suite.
 
-# Copyright (C) 2000-2015, 2018-2022 Free Software Foundation, Inc.
+# Copyright (C) 2000-2015, 2018-2022, 2025-2026 Free Software
+# Foundation, Inc.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -103,6 +104,10 @@ fi
 # Empty if no Java VM was found
 : ${CONF_JAVA='@CONF_JAVA@'}
 
+# An initialization for Java tests.
+lf='
+'
+
 # We need egrep and perl.
 : ${EGREP='@EGREP@'}
 : ${PERL='@PERL@'}
diff --git a/tests/bison.in b/tests/bison.in
index 79143d391..70c09e428 100644
--- a/tests/bison.in
+++ b/tests/bison.in
@@ -2,7 +2,8 @@
 # @configure_input@
 # Wrapper around a non installed bison to make it work as an installed one.
 
-# Copyright (C) 2001-2015, 2018-2022 Free Software Foundation, Inc.
+# Copyright (C) 2001-2015, 2018-2022, 2025-2026 Free Software
+# Foundation, Inc.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/tests/c++.at b/tests/c++.at
index 77db404da..0dfa613f2 100644
--- a/tests/c++.at
+++ b/tests/c++.at
@@ -1,6 +1,6 @@
 # Checking the C++ Features.                    -*- Autotest -*-
 
-# Copyright (C) 2004-2005, 2007-2015, 2018-2022 Free Software
+# Copyright (C) 2004-2005, 2007-2015, 2018-2022, 2025-2026 Free Software
 # Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
diff --git a/tests/calc.at b/tests/calc.at
index 0f6c755f6..85a6925c2 100644
--- a/tests/calc.at
+++ b/tests/calc.at
@@ -1,6 +1,7 @@
 # Simple calculator.                         -*- Autotest -*-
 
-# Copyright (C) 2000-2015, 2018-2022 Free Software Foundation, Inc.
+# Copyright (C) 2000-2015, 2018-2022, 2025-2026 Free Software
+# Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/tests/conflicts.at b/tests/conflicts.at
index 4356b6b82..c3bae74f0 100644
--- a/tests/conflicts.at
+++ b/tests/conflicts.at
@@ -1,6 +1,6 @@
 # Exercising Bison on conflicts.                         -*- Autotest -*-
 
-# Copyright (C) 2002-2005, 2007-2015, 2018-2022 Free Software
+# Copyright (C) 2002-2005, 2007-2015, 2018-2022, 2025-2026 Free Software
 # Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
diff --git a/tests/counterexample.at b/tests/counterexample.at
index 90d2b2406..331d20e81 100644
--- a/tests/counterexample.at
+++ b/tests/counterexample.at
@@ -1,6 +1,6 @@
 # Exercising Bison on counterexamples.                         -*- Autotest -*-
 
-# Copyright (C) 2020-2022 Free Software Foundation, Inc.
+# Copyright (C) 2020-2022, 2025-2026 Free Software Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/tests/cxx-type.at b/tests/cxx-type.at
index 963155414..8e05923cf 100644
--- a/tests/cxx-type.at
+++ b/tests/cxx-type.at
@@ -1,6 +1,7 @@
 # Checking GLR Parsing.                         -*- Autotest -*-
 
-# Copyright (C) 2002-2015, 2018-2022 Free Software Foundation, Inc.
+# Copyright (C) 2002-2015, 2018-2022, 2025-2026 Free Software
+# Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/tests/d.at b/tests/d.at
index 347e868c9..8ae49abe3 100644
--- a/tests/d.at
+++ b/tests/d.at
@@ -1,6 +1,6 @@
 # D features tests.                      -*- Autotest -*-
 
-# Copyright (C) 2020-2022 Free Software Foundation, Inc.
+# Copyright (C) 2020-2022, 2025-2026 Free Software Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/tests/diagnostics.at b/tests/diagnostics.at
index fd63417f7..38c86b4fd 100644
--- a/tests/diagnostics.at
+++ b/tests/diagnostics.at
@@ -1,6 +1,6 @@
 # Checking diagnostics.                              -*- Autotest -*-
 
-# Copyright (C) 2019-2022 Free Software Foundation, Inc.
+# Copyright (C) 2019-2022, 2025-2026 Free Software Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/tests/existing.at b/tests/existing.at
index 7106af6e0..3497b154f 100644
--- a/tests/existing.at
+++ b/tests/existing.at
@@ -1,7 +1,7 @@
 # Exercising Bison on actual grammars.                   -*- Autotest -*-
 
-# Copyright (C) 1989-1992, 2000-2005, 2007, 2009-2015, 2018-2022 Free
-# Software Foundation, Inc.
+# Copyright (C) 1989-1992, 2000-2005, 2007, 2009-2015, 2018-2022,
+# 2025-2026 Free Software Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/tests/glr-regression.at b/tests/glr-regression.at
index 6f2a5f117..ff9ff6faa 100644
--- a/tests/glr-regression.at
+++ b/tests/glr-regression.at
@@ -1,7 +1,7 @@
 # Checking GLR Parsing: Regression Tests           -*- Autotest -*-
 
-# Copyright (C) 2002-2003, 2005-2007, 2009-2015, 2018-2022 Free Software
-# Foundation, Inc.
+# Copyright (C) 2002-2003, 2005-2007, 2009-2015, 2018-2022, 2025-2026
+# Free Software Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/tests/headers.at b/tests/headers.at
index 14b5cddab..3e3f40fa4 100644
--- a/tests/headers.at
+++ b/tests/headers.at
@@ -1,7 +1,7 @@
 # Bison Parser Headers.                               -*- Autotest -*-
 
-# Copyright (C) 2001-2002, 2006-2007, 2009-2015, 2018-2022 Free Software
-# Foundation, Inc.
+# Copyright (C) 2001-2002, 2006-2007, 2009-2015, 2018-2022, 2025-2026
+# Free Software Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/tests/input.at b/tests/input.at
index 04b31f999..a21956fc1 100644
--- a/tests/input.at
+++ b/tests/input.at
@@ -1,6 +1,7 @@
 # Checking the Bison reader.                    -*- Autotest -*-
 
-# Copyright (C) 2002-2015, 2018-2022 Free Software Foundation, Inc.
+# Copyright (C) 2002-2015, 2018-2022, 2025-2026 Free Software
+# Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/tests/java.at b/tests/java.at
index fc25cc16f..35970c50b 100644
--- a/tests/java.at
+++ b/tests/java.at
@@ -1,6 +1,7 @@
 # Java tests for simple calculator.           -*- Autotest -*-
 
-# Copyright (C) 2007-2015, 2018-2022 Free Software Foundation, Inc.
+# Copyright (C) 2007-2015, 2018-2022, 2025-2026 Free Software
+# Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/tests/javapush.at b/tests/javapush.at
index 5a154ef92..faab12f52 100644
--- a/tests/javapush.at
+++ b/tests/javapush.at
@@ -1,6 +1,7 @@
 # Checking Java Push Parsing.                            -*- Autotest -*-
 
-# Copyright (C) 2013-2015, 2018-2022 Free Software Foundation, Inc.
+# Copyright (C) 2013-2015, 2018-2022, 2025-2026 Free Software
+# Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/tests/linear b/tests/linear
index bf21f418a..e930683a7 100755
--- a/tests/linear
+++ b/tests/linear
@@ -3,7 +3,7 @@
 # Build a grammar whose LALR(1) parser has a given number of states.
 # Useful to test edge cases (e.g., 256 and 257 states, etc.).
 
-# Copyright (C) 2020-2022 Free Software Foundation, Inc.
+# Copyright (C) 2020-2022, 2025-2026 Free Software Foundation, Inc.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/tests/local.at b/tests/local.at
index c339d0731..824496b8f 100644
--- a/tests/local.at
+++ b/tests/local.at
@@ -2,7 +2,8 @@
 
 # Macros for the GNU Bison Test suite.
 
-# Copyright (C) 2003-2015, 2018-2022 Free Software Foundation, Inc.
+# Copyright (C) 2003-2015, 2018-2022, 2025-2026 Free Software
+# Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -1598,7 +1599,7 @@ AT_CHECK([sed >&2 -e '/^profiling:.*:Merge mismatch for summaries/d' stderr],
 # AT_JAVA_PARSER_CHECK(COMMAND, EXIT-STATUS, EXPOUT, EXPERR, [PRE])
 # -----------------------------------------------------------------
 m4_define([AT_JAVA_PARSER_CHECK],
-[AT_CHECK([$5[ $SHELL ../../../javaexec.sh ]$1], [$2], [$3], [$4])])
+[AT_CHECK([$5[ $SHELL ../../../javaexec.sh -Dline.separator="$lf" ]$1], [$2], [$3], [$4])])
 
 
 # AT_PARSER_CHECK(COMMAND, EXIT-STATUS, EXPOUT, EXPERR, [PRE])
diff --git a/tests/local.mk b/tests/local.mk
index bc8535a10..10a4a9690 100644
--- a/tests/local.mk
+++ b/tests/local.mk
@@ -1,6 +1,7 @@
 ## Makefile for Bison testsuite.
 
-## Copyright (C) 2000-2015, 2018-2022 Free Software Foundation, Inc.
+## Copyright (C) 2000-2015, 2018-2022, 2025-2026 Free Software
+## Foundation, Inc.
 ##
 ## This program is free software: you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
diff --git a/tests/m4.at b/tests/m4.at
index c8cb00975..87bd179d4 100644
--- a/tests/m4.at
+++ b/tests/m4.at
@@ -1,6 +1,6 @@
 # Basic m4 macros.                               -*- Autotest -*-
 
-# Copyright (C) 2020-2022 Free Software Foundation, Inc.
+# Copyright (C) 2020-2022, 2025-2026 Free Software Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/tests/named-refs.at b/tests/named-refs.at
index 99131b33f..d6e2a6014 100644
--- a/tests/named-refs.at
+++ b/tests/named-refs.at
@@ -1,6 +1,7 @@
 # Named references test.                           -*- Autotest -*-
 
-# Copyright (C) 2009-2015, 2018-2022 Free Software Foundation, Inc.
+# Copyright (C) 2009-2015, 2018-2022, 2025-2026 Free Software
+# Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/tests/output.at b/tests/output.at
index 4ee4bd55f..f7157c624 100644
--- a/tests/output.at
+++ b/tests/output.at
@@ -1,6 +1,6 @@
 # Checking the output filenames.                    -*- Autotest -*-
 
-# Copyright (C) 2000-2002, 2005-2015, 2018-2022 Free Software
+# Copyright (C) 2000-2002, 2005-2015, 2018-2022, 2025-2026 Free Software
 # Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
diff --git a/tests/push.at b/tests/push.at
index 95068c947..b99821fe1 100644
--- a/tests/push.at
+++ b/tests/push.at
@@ -1,7 +1,7 @@
 # Checking Push Parsing.                            -*- Autotest -*-
 
-# Copyright (C) 2007, 2009-2015, 2018-2022 Free Software Foundation,
-# Inc.
+# Copyright (C) 2007, 2009-2015, 2018-2022, 2025-2026 Free Software
+# Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/tests/reduce.at b/tests/reduce.at
index 072951e0a..70b9c92fe 100644
--- a/tests/reduce.at
+++ b/tests/reduce.at
@@ -1,6 +1,6 @@
 # Exercising Bison Grammar Reduction.                      -*- Autotest -*-
 
-# Copyright (C) 2001-2002, 2007-2015, 2018-2022 Free Software
+# Copyright (C) 2001-2002, 2007-2015, 2018-2022, 2025-2026 Free Software
 # Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
diff --git a/tests/regression.at b/tests/regression.at
index 89a4649a9..85681e8f0 100644
--- a/tests/regression.at
+++ b/tests/regression.at
@@ -1,6 +1,7 @@
 # Bison Regressions.                               -*- Autotest -*-
 
-# Copyright (C) 2001-2015, 2018-2022 Free Software Foundation, Inc.
+# Copyright (C) 2001-2015, 2018-2022, 2025-2026 Free Software
+# Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/tests/report.at b/tests/report.at
index 6f1ef4191..00010ab3b 100644
--- a/tests/report.at
+++ b/tests/report.at
@@ -1,6 +1,6 @@
 # Bison Reports.                               -*- Autotest -*-
 
-# Copyright (C) 2018-2022 Free Software Foundation, Inc.
+# Copyright (C) 2018-2022, 2025-2026 Free Software Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/tests/scanner.at b/tests/scanner.at
index 1273630c2..fa82d59d8 100644
--- a/tests/scanner.at
+++ b/tests/scanner.at
@@ -1,6 +1,6 @@
 # Interface with the scanner.                           -*- Autotest -*-
 
-# Copyright (C) 2019-2022 Free Software Foundation, Inc.
+# Copyright (C) 2019-2022, 2025-2026 Free Software Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/tests/sets.at b/tests/sets.at
index 8b9f60294..8a5123fbd 100644
--- a/tests/sets.at
+++ b/tests/sets.at
@@ -1,7 +1,7 @@
 # Exercising Bison Grammar Sets.                      -*- Autotest -*-
 
-# Copyright (C) 2001-2002, 2005, 2007, 2009-2015, 2018-2022 Free
-# Software Foundation, Inc.
+# Copyright (C) 2001-2002, 2005, 2007, 2009-2015, 2018-2022, 2025-2026
+# Free Software Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/tests/skeletons.at b/tests/skeletons.at
index 13f796b5a..d3d107774 100644
--- a/tests/skeletons.at
+++ b/tests/skeletons.at
@@ -1,7 +1,7 @@
 # Checking skeleton support.                     -*- Autotest -*-
 
-# Copyright (C) 2007, 2009-2015, 2018-2022 Free Software Foundation,
-# Inc.
+# Copyright (C) 2007, 2009-2015, 2018-2022, 2025-2026 Free Software
+# Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/tests/synclines.at b/tests/synclines.at
index e8da93a38..c3de971cf 100644
--- a/tests/synclines.at
+++ b/tests/synclines.at
@@ -1,7 +1,7 @@
 # Executing Actions.                               -*- Autotest -*-
 
-# Copyright (C) 2002, 2004-2005, 2007, 2009-2015, 2018-2022 Free
-# Software Foundation, Inc.
+# Copyright (C) 2002, 2004-2005, 2007, 2009-2015, 2018-2022, 2025-2026
+# Free Software Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/tests/testsuite.at b/tests/testsuite.at
index d9929dc0e..87299f675 100644
--- a/tests/testsuite.at
+++ b/tests/testsuite.at
@@ -1,7 +1,7 @@
 # Test suite for GNU Bison.                             -*- Autotest -*-
 
-# Copyright (C) 2000-2004, 2006-2007, 2009-2015, 2018-2022 Free Software
-# Foundation, Inc.
+# Copyright (C) 2000-2004, 2006-2007, 2009-2015, 2018-2022, 2025-2026
+# Free Software Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/tests/torture.at b/tests/torture.at
index cb570f89d..73f59e640 100644
--- a/tests/torture.at
+++ b/tests/torture.at
@@ -1,7 +1,7 @@
 # Torturing Bison.                                    -*- Autotest -*-
 
-# Copyright (C) 2001-2002, 2004-2007, 2009-2015, 2018-2022 Free Software
-# Foundation, Inc.
+# Copyright (C) 2001-2002, 2004-2007, 2009-2015, 2018-2022, 2025-2026
+# Free Software Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/tests/types.at b/tests/types.at
index 64b3bdb38..e554e1b70 100644
--- a/tests/types.at
+++ b/tests/types.at
@@ -1,6 +1,7 @@
 # Value type.                                     -*- Autotest -*-
 
-# Copyright (C) 2013-2015, 2018-2022 Free Software Foundation, Inc.
+# Copyright (C) 2013-2015, 2018-2022, 2025-2026 Free Software
+# Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by