diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index ddcf614b10..ae1e7d9fe1 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+Mon Jan 11 16:43:44 1999  Michael Snyder  <msnyder@cleaver.cygnus.com>
+
+	* remote.c (remote_wait): Add inferior_pid to thread list only
+	if it is not already there.
+
 1999-01-11  Jason Molenda  (jsm@bugshack.cygnus.com)
 
 	* scm-tags.h: Update FSF's address on copyright notice.
diff --git a/gdb/remote.c b/gdb/remote.c
index 14662ad2fb..e6a2252d93 100644
--- a/gdb/remote.c
+++ b/gdb/remote.c
@@ -1814,7 +1814,8 @@ Packet: '%s'\n",
       if (inferior_pid == MAGIC_NULL_PID)
 	{
 	  inferior_pid = thread_num;
-	  add_thread (inferior_pid);
+	  if (!in_thread_list (inferior_pid))
+	    add_thread (inferior_pid);
 	}
       return thread_num;
     }