diff --git a/ChangeLog b/ChangeLog
index 38c8ed96db..6a9b16b02a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-02-17  Fabrice Bauzac  <fabrice.bauzac@wanadoo.fr>
+
+	[BZ #6907]
+	* manual/string.texi (strchr): Change when strchrnul is
+	recommended.
+
 2012-02-17  Dwayne Grant McConnell  <decimal@us.ibm.com>
 
 	[BZ #174]
diff --git a/NEWS b/NEWS
index c25d34343c..59e07eaabf 100644
--- a/NEWS
+++ b/NEWS
@@ -9,9 +9,9 @@ Version 2.16
 
 * The following bugs are resolved with this release:
 
-  174, 350, 411, 3335, 4026, 4822, 5805, 6884, 9902, 10140, 10210, 11494,
-  12047, 13525, 13526, 13527, 13528, 13529, 13530, 13531, 13532, 13533,
-  13547, 13551, 13552, 13553, 13555, 13559, 13583, 13618
+  174, 350, 411, 3335, 4026, 4822, 5805, 6884, 6907, 9902, 10140, 10210,
+  11494, 12047, 13525, 13526, 13527, 13528, 13529, 13530, 13531, 13532,
+  13533, 13547, 13551, 13552, 13553, 13555, 13559, 13583, 13618
 
 * ISO C11 support:
 
diff --git a/manual/string.texi b/manual/string.texi
index f7d4ebea1d..abfb0798b9 100644
--- a/manual/string.texi
+++ b/manual/string.texi
@@ -1647,9 +1647,12 @@ strchr ("hello, world", '?')
 
 The terminating null character is considered to be part of the string,
 so you can use this function get a pointer to the end of a string by
-specifying a null character as the value of the @var{c} argument.  It
-would be better (but less portable) to use @code{strchrnul} in this
-case, though.
+specifying a null character as the value of the @var{c} argument.
+
+When @code{strchr} returns a null pointer, it does not let you know
+the position of the terminating null character it has found.  If you
+need that information, it is better (but less portable) to use
+@code{strchrnul} than to search for it a second time.
 @end deftypefun
 
 @comment wchar.h