diff --git a/ChangeLog b/ChangeLog
index 39cfd525..fcc61070 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-03-20  Ángel González <keisial@gmail.com>
+
+	* bootstrap.conf (gnulib_modules): Add modules `ftello',
+	`mkstemp' and `strtok_r'.
+
 2012-02-26  Giuseppe Scrivano  <gscrivano@gnu.org>
 
 	* bootstrap.conf (gnulib_modules): Add module `closeout'.
diff --git a/bootstrap.conf b/bootstrap.conf
index fff26a6d..7ab3ad0a 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -37,6 +37,7 @@ closeout
 connect
 fcntl
 futimens
+ftello
 getaddrinfo
 getopt-gnu
 getpass-gnu
@@ -50,6 +51,7 @@ listen
 maintainer-makefile
 mbtowc
 mkdir
+mkstemp
 crypto/md5
 crypto/sha1
 pipe
@@ -66,6 +68,7 @@ socket
 stdbool
 strcasestr
 strerror_r-posix
+strtok_r
 tmpdir
 unlocked-io
 update-copyright