diff --git a/gdb/doc/ChangeLog b/gdb/doc/ChangeLog
index 77b1a97f6b2..22f0e14425d 100644
--- a/gdb/doc/ChangeLog
+++ b/gdb/doc/ChangeLog
@@ -1,3 +1,8 @@
+2001-08-02  Corinna Vinschen  <vinschen@redhat.com>
+
+	* gdb.texinfo: Explain omitting the hostname in the
+	`target remote' command.
+
 2001-07-30  Daniel Jacobowitz  <drow@mvista.com>
 
 	* gdbint.texinfo: Remove extraneous START-INFO-DIR-ENTRY
diff --git a/gdb/doc/gdb.texinfo b/gdb/doc/gdb.texinfo
index d5f09e93a26..310750de870 100644
--- a/gdb/doc/gdb.texinfo
+++ b/gdb/doc/gdb.texinfo
@@ -9636,6 +9636,18 @@ terminal server named @code{manyfarms}:
 @example
 target remote manyfarms:2828
 @end example
+
+If your remote target is actually running on the same machine as
+your debugger session (e.g.@: a simulator of your target running on
+the same host), you can omit the hostname.  For example, to connect
+to port 1234 on your local machine:
+
+@example
+target remote :1234
+@end example
+@noindent
+
+Note that the colon is still required here.
 @end enumerate
 
 Now you can use all the usual commands to examine and change data and to