diff --git a/gdb/doc/ChangeLog b/gdb/doc/ChangeLog
index af67037639..84e27e4147 100644
--- a/gdb/doc/ChangeLog
+++ b/gdb/doc/ChangeLog
@@ -1,3 +1,12 @@
+2005-04-22  Eli Zaretskii  <eliz@gnu.org>
+
+	* gdb.texinfo (Remote configuration): Document "set/show
+	get-thread-local-storage-address".  Add cross-reference to the
+	description of the qGetTLSAddr packet.
+	(General Query Packets): Mention "set remote
+	get-thread-local-storage-address" and add a reference to its
+	description.
+
 2005-04-19  Nick Roberts  <nickrob@snap.net.nz>
 
 	* gdb.texinfo (Backtrace): Describe 'bt full'.
diff --git a/gdb/doc/gdb.texinfo b/gdb/doc/gdb.texinfo
index c7f26bdbf0..6e64c1a178 100644
--- a/gdb/doc/gdb.texinfo
+++ b/gdb/doc/gdb.texinfo
@@ -12099,6 +12099,19 @@ packets.
 @itemx show remote access-watchpoint-packet
 @itemx show remote Z-packet
 Show the current setting of @samp{Z} packets usage.
+
+@item set remote get-thread-local-storage-address
+@kindex set remote get-thread-local-storage-address
+@cindex thread local storage of remote targets
+This command enables or disables the use of the @samp{qGetTLSAddr}
+(Get Thread Local Storage Address) request packet.  The default
+depends on whether the remote stub supports this request.
+@xref{General Query Packets, qGetTLSAddr}, for more details about this
+packet.
+
+@item show remote get-thread-local-storage-address
+@kindex show remote get-thread-local-storage-address
+Show the current setting of @samp{qGetTLSAddr} packet usage.
 @end table
 
 @node remote stub
@@ -22771,6 +22784,10 @@ An error occurred.
 An empty reply indicates that @code{qGetTLSAddr} is not supported by the stub.
 @end table
 
+Use of this request packet is controlled by the @code{set remote
+get-thread-local-storage-address} command (@pxref{Remote
+configuration, set remote get-thread-local-storage-address}).
+
 @end table
 
 @node Register Packet Format