diff --git a/ChangeLog b/ChangeLog
index 2e5fdfac..da790493 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2011-08-11  Giuseppe Scrivano  <gscrivano@gnu.org>
 
+	* bootstrap.conf (gnulib_modules): Include module iconv.
+
 	* configure.ac: Allow --with-libgnutls-prefix and
 	--with-libssl-prefix
 	Suggested by: Karl Berry <karl@freefriends.org>
diff --git a/bootstrap.conf b/bootstrap.conf
index 2537f825..e30c93b4 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -42,6 +42,7 @@ getpeername
 getsockname
 gnupload
 ioctl
+iconv
 iconv-h
 listen
 maintainer-makefile