diff --git a/ide/text/fpdebug.pas b/ide/text/fpdebug.pas
index 1ae9cbe7db..825927b1c5 100644
--- a/ide/text/fpdebug.pas
+++ b/ide/text/fpdebug.pas
@@ -1,7 +1,7 @@
 {
     $Id$
     This file is part of the Free Pascal Integrated Development Environment
-    Copyright (c) 1998 by Berczi Gabor
+    Copyright (c) 1998-2000 by Pierre Muller
 
     Debugger call routines for the IDE
 
@@ -341,6 +341,9 @@ implementation
 uses
   Dos,Mouse,Video,
   App,Commands,Strings,
+{$ifdef win32}
+  Windebug,
+{$endif win32}
   Systems,
   FPVars,FPUtils,FPConst,FPSwitch,
   FPIntf,FPCompile,FPIde,FPHelp,
@@ -652,7 +655,7 @@ end;
 
 function  TDebugController.AllowQuit : boolean;
 begin
-  if ConfirmBox('Really quit editor ?',nil,true)=cmOK then
+  if ConfirmBox('Really quit editor?',nil,true)=cmOK then
     begin
       Message(@IDEApp,evCommand,cmQuit,nil);
     end
@@ -821,18 +824,28 @@ end;
 procedure TDebugController.DoDebuggerScreen;
 begin
   if NoSwitch then
-    PopStatus
+    begin
+      PopStatus;
+    end
   else
     IDEApp.ShowIDEScreen;
+{$ifdef win32}
+   ChangeDebuggeeWindowTitleTo(Stopped_State);
+{$endif win32}
 end;
 
 
 procedure TDebugController.DoUserScreen;
 begin
   if NoSwitch then
-    PushStatus('Executable running in another window..')
+    begin
+      PushStatus('Executable running in another window..');
+    end
   else
     IDEApp.ShowUserScreen;
+{$ifdef win32}
+   ChangeDebuggeeWindowTitleTo(Running_State);
+{$endif win32}
 end;
 
 {****************************************************************************
@@ -3217,7 +3230,10 @@ end.
 
 {
   $Log$
-  Revision 1.53  2000-02-07 12:51:32  pierre
+  Revision 1.54  2000-03-06 11:34:25  pierre
+   + windebug unit for Window Title change when debugging
+
+  Revision 1.53  2000/02/07 12:51:32  pierre
    * typo fix
 
   Revision 1.52  2000/02/07 11:50:30  pierre
diff --git a/ide/text/windebug.pas b/ide/text/windebug.pas
new file mode 100644
index 0000000000..fd01d40a7e
--- /dev/null
+++ b/ide/text/windebug.pas
@@ -0,0 +1,73 @@
+{
+    $Id$
+    This file is part of the Free Pascal Integrated Development Environment
+    Copyright (c) 2000 by Pierre Muller
+
+    Win32 specific debugger routines for the IDE
+
+    See the file COPYING.FPC, included in this distribution,
+    for details about the copyright.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+ **********************************************************************}
+Unit windebug;
+
+interface
+
+  type
+    DebuggeeState = (Running_State,Stopped_State);
+
+  procedure  ChangeDebuggeeWindowTitleTo(State : DebuggeeState);
+
+implementation
+
+uses
+  gdbint,
+  strings,
+  windows;
+
+ function GetWindowHandle(H : HWND; state : LPARAM) : WINBOOL;stdcall;
+   var pTitle, pEnd, pNewTitle : pchar;
+       len : longint;
+   begin
+     GetWindowHandle:=true;
+     GetMem(pTitle,256);
+     { we want all windows !! }
+     if GetWindowThreadProcessId(H,nil)=inferior_pid then
+       begin
+         len:=GetWindowText(H,pTitle,256);
+         if DebuggeeState(State) = Stopped_State then
+           begin
+             GetMem(pNewTitle,len+50);
+             pEnd:=strpos(pTitle,'... running under FP debugger');
+             if assigned(pEnd) then
+               pEnd^:=#0;
+             strcopy(pNewTitle,pTitle);
+             strcat(pNewTitle,'... stopped by FP debugger');
+             SetWindowText(H,pNewTitle);
+             FreeMem(pNewTitle,len+50);
+           end
+         else if DebuggeeState(State) = Running_State then
+           begin
+             GetMem(pNewTitle,len+50);
+             pEnd:=strpos(pTitle,'... stopped by FP debugger');
+             if assigned(pEnd) then
+               pEnd^:=#0;
+             strcopy(pNewTitle,pTitle);
+             strcat(pNewTitle,'... running under FP debugger');
+             SetWindowText(H,pNewTitle);
+             FreeMem(pNewTitle,len+50);
+           end;
+       end;
+     FreeMem(pTitle,256);
+   end;
+
+ procedure  ChangeDebuggeeWindowTitleTo(State : DebuggeeState);
+   begin
+     EnumThreadWindows(inferior_pid,EnumWindowsProc(@GetWindowHandle),longint(State));
+   end;
+
+end.
\ No newline at end of file