diff --git a/bootstrap b/bootstrap
index e273ea73..70fd73cc 100755
--- a/bootstrap
+++ b/bootstrap
@@ -4,7 +4,7 @@ scriptversion=2019-01-04.17; # UTC
 
 # Bootstrap this package from checked-out sources.
 
-# Copyright (C) 2003-2019 Free Software Foundation, Inc.
+# Copyright (C) 2003-2020 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 9cfbccae..389e75ff 100644
--- a/data/skeletons/glr.c
+++ b/data/skeletons/glr.c
@@ -1975,7 +1975,8 @@ yyprocessOneStack (yyGLRStack* yystackp, ptrdiff_t yyk,
   while (yystackp->yytops.yystates[yyk] != YY_NULLPTR)
     {
       yyStateNum yystate = yystackp->yytops.yystates[yyk]->yylrState;
-      YY_DPRINTF ((stderr, "Stack %ld Entering state %d\n", yyk, yystate));
+      YY_DPRINTF ((stderr, "Stack %ld Entering state %d\n",
+                   YY_CAST (long, yyk), yystate));
 
       YY_ASSERT (yystate != YYFINAL);
 
diff --git a/data/skeletons/lalr1.cc b/data/skeletons/lalr1.cc
index d3fe1b93..9036575b 100644
--- a/data/skeletons/lalr1.cc
+++ b/data/skeletons/lalr1.cc
@@ -921,7 +921,7 @@ b4_dollar_popdef])[]dnl
       --yyerrstatus_;
 
     // Shift the lookahead token.
-    yypush_ ("Shifting", static_cast<state_type> (yyn), YY_MOVE (yyla));]b4_lac_if([[
+    yypush_ ("Shifting", state_type (yyn), YY_MOVE (yyla));]b4_lac_if([[
     yy_lac_discard_ ("shift");]])[
     goto yynewstate;
 
@@ -1084,7 +1084,7 @@ b4_dollar_popdef])[]dnl
 
       // Shift the error token.]b4_lac_if([[
       yy_lac_discard_ ("error recovery");]])[
-      error_token.state = static_cast<state_type> (yyn);
+      error_token.state = state_type (yyn);
       yypush_ ("Shifting", YY_MOVE (error_token));
     }
     goto yynewstate;
diff --git a/gnulib b/gnulib
index b943dd66..f5eb8cea 160000
--- a/gnulib
+++ b/gnulib
@@ -1 +1 @@
-Subproject commit b943dd6649ea85729999d67a684988c2711a83e6
+Subproject commit f5eb8cea72469348b423ae22068eeb9e1399011b
diff --git a/lib/.gitignore b/lib/.gitignore
index b8253d19..70dfc13e 100644
--- a/lib/.gitignore
+++ b/lib/.gitignore
@@ -139,12 +139,15 @@
 /isnanl.c
 /iswblank.c
 /itold.c
+/lc-charset-dispatch.c
+/lc-charset-dispatch.h
 /ldexpl.c
 /libc-config.h
 /limits.h
 /limits.in.h
 /localcharset.c
 /localcharset.h
+/locale.in.h
 /localtime-buffer.c
 /localtime-buffer.h
 /lstat.c
@@ -158,10 +161,14 @@
 /mbchar.h
 /mbfile.c
 /mbfile.h
+/mbrtowc-impl-utf8.h
+/mbrtowc-impl.h
 /mbrtowc.c
 /mbsinit.c
 /mbswidth.c
 /mbswidth.h
+/mbtowc-lock.c
+/mbtowc-lock.h
 /memchr.c
 /memchr.valgrind
 /minmax.h
@@ -209,6 +216,9 @@
 /sched.h
 /sched.in.h
 /setenv.c
+/setlocale-lock.c
+/setlocale_null.c
+/setlocale_null.h
 /sig-handler.c
 /sig-handler.h
 /sigaction.c
diff --git a/m4/.gitignore b/m4/.gitignore
index 3f79935e..12735327 100644
--- a/m4/.gitignore
+++ b/m4/.gitignore
@@ -88,9 +88,9 @@
 /locale-fr.m4
 /locale-ja.m4
 /locale-zh.m4
+/locale_h.m4
 /localtime-buffer.m4
 /lock.m4
-/longlong.m4
 /lstat.m4
 /malloc.m4
 /malloca.m4
@@ -141,6 +141,7 @@
 /rmdir.m4
 /sched_h.m4
 /setenv.m4
+/setlocale_null.m4
 /sh-filename.m4
 /sig_atomic_t.m4
 /sigaction.m4
diff --git a/src/parse-gram.c b/src/parse-gram.c
index 706b66f6..5a07e749 100644
--- a/src/parse-gram.c
+++ b/src/parse-gram.c
@@ -1573,6 +1573,8 @@ yysyntax_error (YYPTRDIFF_T *yymsg_alloc, char **yymsg,
   if (yytoken != YYEMPTY)
     {
       int yyn = yypact[+*yyssp];
+      YYPTRDIFF_T yysize0 = yytnamerr (YY_NULLPTR, yytname[yytoken]);
+      yysize = yysize0;
       YYDPRINTF ((stderr, "Constructing syntax error message\n"));
       yyarg[yycount++] = yytname[yytoken];
       if (!yypact_value_is_default (yyn))