diff --git a/lib/.gitignore b/lib/.gitignore
index 3230f5b..d6f599c 100644
--- a/lib/.gitignore
+++ b/lib/.gitignore
@@ -6,6 +6,7 @@ c-ctype.h
 c-strcase.h
 c-strcasecmp.c
 c-strncasecmp.c
+config.charset
 ctype.in.h
 dosname.h
 errno.in.h
@@ -41,9 +42,16 @@ isnanf.c
 isnanl-nolibm.h
 isnanl.c
 langinfo.in.h
+localcharset.c
+localcharset.h
 locale.in.h
 malloc.c
 math.in.h
+mbrtowc.c
+mbsinit.c
+mbsrtowcs-impl.h
+mbsrtowcs-state.c
+mbsrtowcs.c
 memchr.c
 memchr.valgrind
 printf-args.c
@@ -55,6 +63,8 @@ printf-frexpl.h
 printf-parse.c
 printf-parse.h
 printf.c
+ref-add.sin
+ref-del.sin
 sig-handler.h
 sigaction.c
 signal.in.h
@@ -74,10 +84,13 @@ stdio.in.h
 stdlib.in.h
 str-two-way.h
 strdup.c
+streq.h
 striconv.c
 striconv.h
 string.in.h
 strncat.c
+strnlen1.c
+strnlen1.h
 strstr.c
 sys_stat.in.h
 sys_time.in.h
@@ -91,6 +104,10 @@ verify.h
 vfprintf.c
 vsnprintf.c
 wchar.in.h
+wcrtomb.c
+wcsrtombs-impl.h
+wcsrtombs-state.c
+wcsrtombs.c
 wctype.in.h
 xsize.h
 
diff --git a/m4/.gitignore b/m4/.gitignore
index 60c8caa..d371b13 100644
--- a/m4/.gitignore
+++ b/m4/.gitignore
@@ -4,6 +4,7 @@ asm-underscore.m4
 assert.m4
 codeset.m4
 config-h.m4
+configmake.m4
 ctype.m4
 errno_h.m4
 exponentd.m4
@@ -48,11 +49,19 @@ lib-ld.m4
 lib-link.m4
 lib-prefix.m4
 libunistring-base.m4
+localcharset.m4
+locale-fr.m4
+locale-ja.m4
+locale-zh.m4
 locale_h.m4
 lock.m4
 longlong.m4
 malloc.m4
 math_h.m4
+mbrtowc.m4
+mbsinit.m4
+mbsrtowcs.m4
+mbstate_t.m4
 memchr.m4
 mmap-anon.m4
 multiarch.m4
@@ -98,6 +107,8 @@ vsnprintf.m4
 warn-on-use.m4
 wchar_h.m4
 wchar_t.m4
+wcrtomb.m4
+wcsrtombs.m4
 wctype_h.m4
 wint_t.m4
 xsize.m4
diff --git a/m4/gnulib-cache.m4 b/m4/gnulib-cache.m4
index 4608fa9..2d5a2b0 100644
--- a/m4/gnulib-cache.m4
+++ b/m4/gnulib-cache.m4
@@ -15,7 +15,7 @@
 
 
 # Specification in the form of a command-line invocation:
-#   gnulib-tool --import --dir=. --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --no-conditional-dependencies --no-libtool --macro-prefix=gl assert config-h ctype fprintf-posix getopt-gnu gettext gettext-h gettimeofday langinfo locale printf-posix sigaction signal snprintf-posix stat stdarg stdbool stdio strdup-posix striconv string strncat strstr sys_stat sys_time unistd vfprintf-posix vsnprintf-posix wchar wctype-h
+#   gnulib-tool --import --dir=. --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --no-conditional-dependencies --no-libtool --macro-prefix=gl assert config-h ctype fprintf-posix getopt-gnu gettext gettext-h gettimeofday langinfo locale mbrtowc mbsrtowcs printf-posix sigaction signal snprintf-posix stat stdarg stdbool stdio strdup-posix striconv string strncat strstr sys_stat sys_time unistd vfprintf-posix vsnprintf-posix wchar wcrtomb wcsrtombs wctype-h
 
 # Specification in the form of a few gnulib-tool.m4 macro invocations:
 gl_LOCAL_DIR([])
@@ -30,6 +30,8 @@ gl_MODULES([
   gettimeofday
   langinfo
   locale
+  mbrtowc
+  mbsrtowcs
   printf-posix
   sigaction
   signal
@@ -49,6 +51,8 @@ gl_MODULES([
   vfprintf-posix
   vsnprintf-posix
   wchar
+  wcrtomb
+  wcsrtombs
   wctype-h
 ])
 gl_AVOID([])