diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index a88d83e74c..f788cb4767 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2008-09-08  Pedro Alves  <pedro@codesourcery.com>
+
+	* spu-linux-nat.c (spu_child_post_startup_inferior)
+	(spu_child_post_attach): Don't add the main thread here.
+
 2008-09-08  Pedro Alves  <pedro@codesourcery.com>
 
 	Use ptid_t.tid to store thread ids instead of ptid_t.pid.
diff --git a/gdb/spu-linux-nat.c b/gdb/spu-linux-nat.c
index e19b718c3a..5d763009b3 100644
--- a/gdb/spu-linux-nat.c
+++ b/gdb/spu-linux-nat.c
@@ -376,8 +376,6 @@ spu_child_post_startup_inferior (ptid_t ptid)
       ptrace (PT_SYSCALL, tid, (PTRACE_TYPE_ARG3) 0, 0);
       waitpid (tid, NULL, __WALL | __WNOTHREAD);
     }
-
-  add_thread_silent (ptid);
 }
 
 /* Override the post_attach routine to try load the SPE executable
@@ -397,8 +395,6 @@ spu_child_post_attach (int pid)
       waitpid (pid, NULL, __WALL | __WNOTHREAD);
     }
 
-  add_thread_silent (inferior_ptid);
-
   /* If the user has not provided an executable file, try to extract
      the image from inside the target process.  */
   if (!get_exec_file (0))