diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog
index 9336f6db4e7..b878baf59f7 100644
--- a/gdb/gdbserver/ChangeLog
+++ b/gdb/gdbserver/ChangeLog
@@ -1,3 +1,8 @@
+2009-07-28  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* linux-low.c (linux_kill_one_lwp): Adjust kernel workaround to skip
+	the main thread again.
+
 2009-07-06  Aleksandar Ristovski  <aristovski@qnx.com>
 
 	Adding Neutrino gdbserver.
diff --git a/gdb/gdbserver/linux-low.c b/gdb/gdbserver/linux-low.c
index 5284a983971..6d677f259e3 100644
--- a/gdb/gdbserver/linux-low.c
+++ b/gdb/gdbserver/linux-low.c
@@ -589,7 +589,7 @@ linux_kill_one_lwp (struct inferior_list_entry *entry, void *args)
      the children get a chance to be reaped, it will remain a zombie
      forever.  */
 
-  if (last_thread_of_process_p (thread))
+  if (lwpid_of (lwp) == pid)
     {
       if (debug_threads)
 	fprintf (stderr, "lkop: is last of process %s\n",