diff --git a/ChangeLog b/ChangeLog
index 808ea106b2..c62798e25a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2014-04-28  Ondřej Bílka  <neleai@seznam.cz>
 
+	[BZ #16754]
+	* manual/stdio.texi (Hook functions): Fix types of stream hook
+	functions.
 	[BZ #16854]
 	* socket/sys/socket.h: Fix typo in comment.
 
diff --git a/NEWS b/NEWS
index 48498dfcc2..018e7876f9 100644
--- a/NEWS
+++ b/NEWS
@@ -14,8 +14,8 @@ Version 2.20
   16609, 16610, 16611, 16613, 16619, 16623, 16629, 16632, 16634, 16639,
   16642, 16648, 16649, 16670, 16674, 16677, 16680, 16683, 16689, 16695,
   16701, 16706, 16707, 16712, 16713, 16714, 16731, 16739, 16740, 16743,
-  16758, 16759, 16760, 16770, 16786, 16789, 16799, 16800, 16815, 16824,
-  16831, 16838, 16854.
+  16754, 16758, 16759, 16760, 16770, 16786, 16789, 16799, 16800, 16815,
+  16824, 16831, 16838, 16854.
 
 * Running the testsuite no longer terminates as soon as a test fails.
   Instead, a file tests.sum (xtests.sum from "make xcheck") is generated,
diff --git a/manual/stdio.texi b/manual/stdio.texi
index efdaaadf27..e40717034c 100644
--- a/manual/stdio.texi
+++ b/manual/stdio.texi
@@ -5305,26 +5305,26 @@ otherwise.
 
 @comment stdio.h
 @comment GNU
-@deftp {Data Type} cookie_read_function
+@deftp {Data Type} cookie_read_function_t
 This is the data type that the read function for a custom stream should have.
 If you declare the function as shown above, this is the type it will have.
 @end deftp
 
 @comment stdio.h
 @comment GNU
-@deftp {Data Type} cookie_write_function
+@deftp {Data Type} cookie_write_function_t
 The data type of the write function for a custom stream.
 @end deftp
 
 @comment stdio.h
 @comment GNU
-@deftp {Data Type} cookie_seek_function
+@deftp {Data Type} cookie_seek_function_t
 The data type of the seek function for a custom stream.
 @end deftp
 
 @comment stdio.h
 @comment GNU
-@deftp {Data Type} cookie_close_function
+@deftp {Data Type} cookie_close_function_t
 The data type of the close function for a custom stream.
 @end deftp