diff --git a/gdb/doc/ChangeLog b/gdb/doc/ChangeLog
index d38550a4d92..7d8002e895b 100644
--- a/gdb/doc/ChangeLog
+++ b/gdb/doc/ChangeLog
@@ -1,3 +1,8 @@
+2015-06-17  Patrick Palka  <patrick@parcs.ath.cx>
+
+	* gdb.texinfo (Command History): Mention that setting
+	GDBHISTSIZE to the empty string disables history truncation.
+
 2015-06-17  Patrick Palka  <patrick@parcs.ath.cx>
 
 	PR gdb/16999
diff --git a/gdb/doc/gdb.texinfo b/gdb/doc/gdb.texinfo
index 9889b695c97..c9a532a366f 100644
--- a/gdb/doc/gdb.texinfo
+++ b/gdb/doc/gdb.texinfo
@@ -22641,9 +22641,9 @@ Stop recording command history in a file.
 Set the number of commands which @value{GDBN} keeps in its history list.
 This defaults to the value of the environment variable @env{GDBHISTSIZE}, or
 to 256 if this variable is not set.  Non-numeric values of @env{GDBHISTSIZE}
-are ignored.  If @var{size} is @code{unlimited} or if @env{GDBHISTSIZE} is a
-negative number, the number of commands @value{GDBN} keeps in the history list
-is unlimited.
+are ignored.  If @var{size} is @code{unlimited} or if @env{GDBHISTSIZE} is
+either a negative number or the empty string, then the number of commands
+@value{GDBN} keeps in the history list is unlimited.
 @end table
 
 History expansion assigns special meaning to the character @kbd{!}.