diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog
index 0586966437..416a09d73d 100644
--- a/gdb/gdbserver/ChangeLog
+++ b/gdb/gdbserver/ChangeLog
@@ -1,11 +1,15 @@
+2008-02-14  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* server.c (monitor_show_help): Add "exit".
+
 2008-02-11  Maxim Grigoriev  <maxim2405@gmail.com>
 
-	* gdbserver/Makefile.in (SFILES): Add linux-xtensa-low.c.
+	* Makefile.in (SFILES): Add linux-xtensa-low.c.
 	(clean): Add reg-xtensa.c.
 	(linux-xtensa-low.o, reg-xtensa.o, reg-xtensa.c): New dependencies.
-	* gdbserver/configure.srv (xtensa*-*-linux*) New target.
-	* gdbserver/linux-xtensa-low.c: New.
-	* gdbserver/xtensa-xtregs.c: New.
+	* configure.srv (xtensa*-*-linux*) New target.
+	* linux-xtensa-low.c: New.
+	* xtensa-xtregs.c: New.
 
 2008-02-01  Pedro Alves  <pedro_alves@portugalmail.pt>
 
diff --git a/gdb/gdbserver/server.c b/gdb/gdbserver/server.c
index 51dfbcce08..bcb440c21f 100644
--- a/gdb/gdbserver/server.c
+++ b/gdb/gdbserver/server.c
@@ -268,6 +268,8 @@ monitor_show_help (void)
   monitor_output ("    Enable general debugging messages\n");  
   monitor_output ("  set remote-debug <0|1>\n");
   monitor_output ("    Enable remote protocol debugging messages\n");
+  monitor_output ("  exit\n");
+  monitor_output ("    Quit GDBserver\n");
 }
 
 #define require_running(BUF)			\