diff --git a/ChangeLog b/ChangeLog
index cfdf145..032f7fc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2019-07-02  Bruno Haible  <bruno@clisp.org>
 
+	Update to current gnulib.
+	* Makefile.devel (GNULIB_MODULES): Add lib-symbol-visibility.
+	(srclib/Makefile.gnulib): Copy codeset.m4.
+	* srclib/Makefile.am (AM_CFLAGS): Initialize.
+
+2019-07-02  Bruno Haible  <bruno@clisp.org>
+
 	Drop unused macro gl_GLIBC21.
 	* autogen.sh: Don't copy glibc21.m4.
 
diff --git a/Makefile.devel b/Makefile.devel
index 5fb5ea4..1f5ee16 100644
--- a/Makefile.devel
+++ b/Makefile.devel
@@ -50,6 +50,7 @@
   error \
   gettext \
   gettext-h \
+  lib-symbol-visibility \
   mbstate \
   progname \
   relocatable-prog \
@@ -66,6 +67,7 @@
 
 srclib/Makefile.gnulib :
 	if test -n "$$GNULIB_TOOL"; then \
+	  $$GNULIB_TOOL --copy-file m4/codeset.m4 srcm4/codeset.m4 || exit $$?; \
 	  $$GNULIB_TOOL --lib=libicrt --source-base=srclib --m4-base=srcm4 --makefile-name=Makefile.gnulib --no-libtool --local-dir=gnulib-local --no-vc-files \
 	    --import $(GNULIB_MODULES); \
 	fi
diff --git a/srclib/Makefile.am b/srclib/Makefile.am
index 96772e9..7cc3749 100644
--- a/srclib/Makefile.am
+++ b/srclib/Makefile.am
@@ -1,5 +1,5 @@
 ## Makefile for the srclib subdirectory of GNU libiconv
-## Copyright (C) 2003-2006, 2009, 2016 Free Software Foundation, Inc.
+## Copyright (C) 2003-2006, 2009, 2016, 2019 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
@@ -25,5 +25,6 @@
 noinst_LIBRARIES =
 
 AM_CPPFLAGS =
+AM_CFLAGS =
 
 include Makefile.gnulib