diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 8771977c930..c36d5405a5c 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2010-08-06  Maciej W. Rozycki  <macro@codesourcery.com>
+
+	* thread.c (add_thread_silent): Use null_ptid instead of
+	minus_one_ptid while getting rid of stale inferior_ptid.
+
 2010-08-06  Corinna Vinschen  <vinschen@redhat.com>
 
 	* dwarf2-frame.c (struct dwarf2_cie): Add ptr_size member.
diff --git a/gdb/thread.c b/gdb/thread.c
index 2fdc7f9b326..0b291bae972 100644
--- a/gdb/thread.c
+++ b/gdb/thread.c
@@ -187,11 +187,11 @@ add_thread_silent (ptid_t ptid)
 
       if (ptid_equal (inferior_ptid, ptid))
 	{
-	  tp = new_thread (ptid);
+	  tp = new_thread (null_ptid);
 
 	  /* Make switch_to_thread not read from the thread.  */
 	  tp->state_ = THREAD_EXITED;
-	  switch_to_thread (minus_one_ptid);
+	  switch_to_thread (null_ptid);
 
 	  /* Now we can delete it.  */
 	  delete_thread (ptid);