diff --git a/ChangeLog b/ChangeLog
index e034de0..8edde3e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2018-03-27  Bruno Haible  <bruno@clisp.org>
+
+	Doc tweaks.
+	* README: Don't recommend to use --prefix=/usr/local, as it produces
+	problems with GCC (since GCC's treatment of /usr/local/include and
+	/usr/local/lib is inconsistent by default). Don't recommend to use
+	the iconv.m4 installed by GNU gettext, because it won't work when
+	GNU automake and GNU gettext are installed with different --prefix
+	options; instead recommend the 'iconv' module from gnulib.
+
 2018-01-27  Bruno Haible  <bruno@clisp.org>
 
 	Rename some files.
diff --git a/README b/README
index 19f8370..176d2b7 100644
--- a/README
+++ b/README
@@ -90,7 +90,7 @@
 
 As usual for GNU packages:
 
-    $ ./configure --prefix=/usr/local
+    $ ./configure --prefix=[[PREFIX]]     where [[PREFIX]] is e.g. $HOME/local
     $ make
     $ make install
 
@@ -125,8 +125,8 @@
       the functions the placeholder @LIBICONV@ (or, if using libtool for
       the link, @LTLIBICONV@). If you use automake, the right place for
       these additions are the *_LDADD variables.
-    Note that 'iconv.m4' is also part of the GNU gettext package, which
-    installs it in /usr/local/share/aclocal/iconv.m4.
+    Note that 'iconv.m4' is also part of GNU gnulib, available through
+    the gnulib module 'iconv'.
 
   - The libc plug/override mode. This works on GNU/Linux, Solaris and OSF/1
     systems only. It is a way to get good iconv support without having
@@ -135,10 +135,10 @@
     with LD_PRELOAD, to override the iconv* functions present in the C library.
 
     On GNU/Linux and Solaris:
-        $ export LD_PRELOAD=/usr/local/lib/preloadable_libiconv.so
+        $ export LD_PRELOAD=[[PREFIX]]/lib/preloadable_libiconv.so
 
     On OSF/1:
-        $ export _RLD_LIST=/usr/local/lib/preloadable_libiconv.so:DEFAULT
+        $ export _RLD_LIST=[[PREFIX]]/lib/preloadable_libiconv.so:DEFAULT
 
     A program's source need not be modified, the program need not even be
     recompiled. Just set the LD_PRELOAD environment variable, that's it!