diff --git a/lib/.gitignore b/lib/.gitignore
index d6f599c..41ca201 100644
--- a/lib/.gitignore
+++ b/lib/.gitignore
@@ -98,6 +98,7 @@ time.in.h
 unistd.in.h
 unistr.in.h
 unitypes.in.h
+uniwidth.in.h
 vasnprintf.c
 vasnprintf.h
 verify.h
@@ -109,6 +110,7 @@ wcsrtombs-impl.h
 wcsrtombs-state.c
 wcsrtombs.c
 wctype.in.h
+wcwidth.c
 xsize.h
 
 alloca.h
@@ -143,3 +145,6 @@ unistr/.dirstamp
 unistr/u8-mbtoucr.c
 unistr/u8-uctomb-aux.c
 unistr/u8-uctomb.c
+
+uniwidth/cjk.h
+uniwidth/width.c
diff --git a/m4/.gitignore b/m4/.gitignore
index d371b13..751f4c1 100644
--- a/m4/.gitignore
+++ b/m4/.gitignore
@@ -110,5 +110,6 @@ wchar_t.m4
 wcrtomb.m4
 wcsrtombs.m4
 wctype_h.m4
+wcwidth.m4
 wint_t.m4
 xsize.m4
diff --git a/m4/gnulib-cache.m4 b/m4/gnulib-cache.m4
index 2d5a2b0..828e456 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 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
+#   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 wcwidth
 
 # Specification in the form of a few gnulib-tool.m4 macro invocations:
 gl_LOCAL_DIR([])
@@ -54,6 +54,7 @@ gl_MODULES([
   wcrtomb
   wcsrtombs
   wctype-h
+  wcwidth
 ])
 gl_AVOID([])
 gl_SOURCE_BASE([lib])