diff --git a/ChangeLog b/ChangeLog
index 925f61c..91e437b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2016-12-03  Bruno Haible  <bruno@clisp.org>
 
+	Update documentation.
+	* HACKING: Refer to the Git repository.
+
+2016-12-03  Bruno Haible  <bruno@clisp.org>
+
 	Avoid compilation warnings in 'genflags' program.
 	* lib/genflags.c: Avoid warnings from GCC's -Wunused-function option.
 
diff --git a/HACKING b/HACKING
index 0c291e2..7b16251 100644
--- a/HACKING
+++ b/HACKING
@@ -1,5 +1,5 @@
 All you need to know when hacking (modifying) GNU libiconv or when building
-it off the CVS.
+it off the Git repository.
 
 
 Requirements
@@ -42,13 +42,15 @@
 And, of course, the packages listed in the DEPENDENCIES file.
 
 
-Building off the CVS
-====================
+Building off the Git repository
+===============================
 
-Access to the CVS is described at http://sourceforge.net/cvs/?group_id=51585 .
+Access to the Git repository is described at
+https://savannah.gnu.org/git/?group=libiconv .
 
-After fetching the sources from the CVS, peek at the comments in autogen.sh,
-then run "./autogen.sh"; then you can proceed with "./configure" as usual.
+After fetching the sources from the Git repository, peek at the comments in
+autogen.sh, then run "./autogen.sh"; then you can proceed with "./configure"
+as usual.
 
 
 Adding new encodings
diff --git a/libcharset/ChangeLog b/libcharset/ChangeLog
index 303e0dc..8c8b979 100644
--- a/libcharset/ChangeLog
+++ b/libcharset/ChangeLog
@@ -1,3 +1,10 @@
+2016-12-03  Bruno Haible  <bruno@clisp.org>
+
+	Update documentation.
+	* README: Update the libiconv version number.
+	* HACKING: Refer to the Git repository.
+	* INTEGRATE: Mention the Gnulib module.
+
 2016-11-23  Bruno Haible  <bruno@clisp.org>
 
 	Update installation instructions for Windows.
diff --git a/libcharset/HACKING b/libcharset/HACKING
index 57c744c..7b5cf3a 100644
--- a/libcharset/HACKING
+++ b/libcharset/HACKING
@@ -1,5 +1,5 @@
 All you need to know when hacking (modifying) GNU libcharset or when building
-it off the CVS.
+it off the Git repository.
 
 
 Requirements
@@ -26,11 +26,13 @@
 And, of course, the packages listed in the DEPENDENCIES file.
 
 
-Building off the CVS
-====================
+Building off the Git repository
+===============================
 
-Access to the CVS is described at http://sourceforge.net/cvs/?group_id=51585 .
+Access to the Git repository is described at
+https://savannah.gnu.org/git/?group=libiconv .
 
-After fetching the sources from the CVS, peek at the comments in autogen.sh,
-then run "./autogen.sh"; then you can proceed with "./configure" as usual.
+After fetching the sources from the Git repository, peek at the comments in
+autogen.sh, then run "./autogen.sh"; then you can proceed with "./configure"
+as usual.
 
diff --git a/libcharset/INTEGRATE b/libcharset/INTEGRATE
index 2eb1b03..543a00f 100644
--- a/libcharset/INTEGRATE
+++ b/libcharset/INTEGRATE
@@ -1,5 +1,10 @@
 Integration of this library into your package:
 
+The preferred way is to use the Gnulib module 'localcharset'.
+
+Here are instructions if you don't want to use Gnulib. It's tedious,
+many small changes to your package:
+
 * Copy the lib/ sourcefiles (localcharset.c, config.charset, ref-add.sin,
   ref-del.sin) and the include file (include/localcharset.h) into your
   package.
@@ -13,7 +18,7 @@
     AM_LANGINFO_CODESET
     gl_FCNTL_O_FLAGS
     jm_GLIBC21
-    AC_CHECK_HEADERS(stddef.h stdlib.h string.h)
+    AC_CHECK_HEADERS([stddef.h stdlib.h string.h])
 
   and make sure that it sets and AC_SUBSTs the PACKAGE variable.
 
diff --git a/libcharset/README b/libcharset/README
index 581f637..67b74ca 100644
--- a/libcharset/README
+++ b/libcharset/README
@@ -53,7 +53,7 @@
 
 Distribution:
     The libcharset directory of
-    ftp://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.8.tar.gz
+    ftp://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.14.tar.gz
 
 Homepage:
     http://www.haible.de/bruno/packages-libcharset.html