diff --git a/gdb/doc/ChangeLog b/gdb/doc/ChangeLog
index f3ccebac36..5adb06f774 100644
--- a/gdb/doc/ChangeLog
+++ b/gdb/doc/ChangeLog
@@ -1,3 +1,8 @@
+2014-05-17  David Taylor <dtaylor@emc.com>
+
+	* gdb.texinfo (General Query Packets): Add a note about thread IDs
+	mentioned in the qfThreadInfo reply.
+
 2014-05-16  Doug Evans  <dje@google.com>
 
 	* gdb.texinfo (Mode Options): Add -D.
diff --git a/gdb/doc/gdb.texinfo b/gdb/doc/gdb.texinfo
index 49a060261f..a6bde127cc 100644
--- a/gdb/doc/gdb.texinfo
+++ b/gdb/doc/gdb.texinfo
@@ -34806,6 +34806,12 @@ with @samp{l} (lower-case ell, for @dfn{last}).
 Refer to @ref{thread-id syntax}, for the format of the @var{thread-id}
 fields.
 
+@emph{Note: @value{GDBN} will send the @code{qfThreadInfo} query during the
+initial connection with the remote target, and the very first thread ID
+mentioned in the reply will be stopped by @value{GDBN} in a subsequent
+message.  Therefore, the stub should ensure that the first thread ID in
+the @code{qfThreadInfo} reply is suitable for being stopped by @value{GDBN}.}
+
 @item qGetTLSAddr:@var{thread-id},@var{offset},@var{lm}
 @cindex get thread-local storage address, remote request
 @cindex @samp{qGetTLSAddr} packet