diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index a00a1bd6d7..81d4f6581b 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2008-01-17  Jim Blandy  <jimb@codesourcery.com>
+
+	* README: Mention gdbserver/README.
+
 2008-01-17  Pierre Muller  <muller@ics.u-strasbg.fr>
 
 	* valarith.c (value_binop): Handle BINOP_INTDIV
diff --git a/gdb/README b/gdb/README
index 9c644251a9..cc16ecd320 100644
--- a/gdb/README
+++ b/gdb/README
@@ -453,6 +453,10 @@ with the remote.c stub over a serial line.
 allows remote debugging for Unix applications.  gdbserver is only
 supported for some native configurations, including Sun 3, Sun 4, and
 Linux.
+The file gdb/gdbserver/README includes further notes on gdbserver; in
+particular, it explains how to build gdbserver for cross-debugging
+(where gdbserver runs on the target machine, which is of a different
+architecture than the host machine running GDB).
 
    There are a number of remote interfaces for talking to existing ROM
 monitors and other hardware: