diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 96760135b0..82dbd52360 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2008-07-24  Aleksandar Ristovski  <aristovski@qnx.com>
+
+	* nto-procfs.c (procfs_attach): Populate initial thread list.
+	(procfs_wait): Return new pid, built from the inferior status.
+
 2008-07-23  Thiago Jung Bauermann  <bauerman@br.ibm.com>
 
 	* configure.ac (CONFIG_INITS): Delete long obsoleted variable.
diff --git a/gdb/nto-procfs.c b/gdb/nto-procfs.c
index 2ef6e0f6a7..028394bdd9 100644
--- a/gdb/nto-procfs.c
+++ b/gdb/nto-procfs.c
@@ -535,6 +535,7 @@ procfs_attach (char *args, int from_tty)
       gdb_flush (gdb_stdout);
     }
   inferior_ptid = do_attach (pid_to_ptid (pid));
+  procfs_find_new_threads ();
   push_target (&procfs_ops);
 }
 
@@ -706,7 +707,7 @@ procfs_wait (ptid_t ptid, struct target_waitstatus *ourstatus)
 	}
     }
 
-  return inferior_ptid;
+  return ptid_build (status.pid, 0, status.tid);
 }
 
 /* Read the current values of the inferior's registers, both the