diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog
index 6d60590733d..a43a86fd57e 100644
--- a/gdb/gdbserver/ChangeLog
+++ b/gdb/gdbserver/ChangeLog
@@ -1,3 +1,8 @@
+2009-06-24  Pierre Muller  <muller@ics.u-strasbg.fr>
+
+	* server.c (handle_v_kill): Pass signal_pid to
+	kill_inferior if multi_process is zero.
+
 2009-06-23  Aleksandar Ristovski  <aristovski@qnx.com>
 
 	* server.c (process_serial_event): Add support for Z0 and Z1 packet.
diff --git a/gdb/gdbserver/server.c b/gdb/gdbserver/server.c
index 566e47dc222..01928c9a6fe 100644
--- a/gdb/gdbserver/server.c
+++ b/gdb/gdbserver/server.c
@@ -1523,8 +1523,10 @@ handle_v_kill (char *own_buf)
 {
   int pid;
   char *p = &own_buf[6];
-
-  pid = strtol (p, NULL, 16);
+  if (multi_process)
+    pid = strtol (p, NULL, 16);
+  else
+    pid = signal_pid;
   if (pid != 0 && kill_inferior (pid) == 0)
     {
       last_status.kind = TARGET_WAITKIND_SIGNALLED;