diff --git a/debugger/gdbmidebugger.pp b/debugger/gdbmidebugger.pp
index f84e4b48d0..9c4a17b6a8 100644
--- a/debugger/gdbmidebugger.pp
+++ b/debugger/gdbmidebugger.pp
@@ -1543,12 +1543,9 @@ begin
   // try to find PID
   if ExecuteCommand('info program', [], ResultState, S, [cfIgnoreError, cfNoMICommand])
   then begin
-     TargetPIDPart := GetPart(['child process ', 'child thread '], [' ', '.'], S, True);
+     TargetPIDPart := GetPart(['child process ', 'child thread ', 'lwp '], 
+                              [' ', '.', ')'], S, True);
      FTargetPID := StrToIntDef(TargetPIDPart, 0);
-     if FTargetPID <= 0 then begin
-       TargetPIDPart := GetPart(['LWP '], [' ', ')'], S, True);
-       FTargetPID := StrToIntDef(TargetPIDPart, 0);
-     end;
      WriteLN('[Debugger] Target PID: ', FTargetPID);
   end
   else begin
@@ -2264,6 +2261,9 @@ initialization
 end.
 { =============================================================================
   $Log$
+  Revision 1.46  2004/04/14 23:07:20  marc
+  * Merged Getpart for target PID form Colin Western
+
   Revision 1.45  2004/04/13 20:14:26  mattias
   fixed debugging under fedora core  from Colin