diff --git a/gdb/doc/ChangeLog b/gdb/doc/ChangeLog
index e925da1dd1..8dd60acbbb 100644
--- a/gdb/doc/ChangeLog
+++ b/gdb/doc/ChangeLog
@@ -1,3 +1,7 @@
+2013-12-03  Tom Tromey  <tromey@redhat.com>
+
+	* gdb.texinfo (@direntry): Add menu item for gdbserver.
+
 2013-12-03  Walfred Tedeschi  <walfred.tedeschi@intel.com>
 
 	* gdb.texinfo (i386 Features): Add MPX feature registers.
diff --git a/gdb/doc/gdb.texinfo b/gdb/doc/gdb.texinfo
index 5896e3a61e..35e3eede25 100644
--- a/gdb/doc/gdb.texinfo
+++ b/gdb/doc/gdb.texinfo
@@ -45,6 +45,7 @@
 @dircategory Software development
 @direntry
 * Gdb: (gdb).                     The GNU debugger.
+* gdbserver: (gdb) Server.        The GNU debugging server.
 @end direntry
 
 @copying