diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index a45b90b7a0..f65dbd439e 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -1,3 +1,7 @@
+2001-02-08 14:55 GMT+1 Maurilio Longo <maurilio.longo@libero.it>
+   * source/debug/debugger.prg
+     * changed OSShell() method to use COMSPEC environment variable
+
 2001-02-08 11:30 GMT+1 Antonio Linares <alinares@fivetech.com>
   * harbour/source/compiler/genc.c
     ! improved support for HB_P_STATICNAME
diff --git a/harbour/source/debug/debugger.prg b/harbour/source/debug/debugger.prg
index fd4f9816c8..5f70d00f76 100644
--- a/harbour/source/debug/debugger.prg
+++ b/harbour/source/debug/debugger.prg
@@ -872,11 +872,31 @@ METHOD OSShell() CLASS TDebugger
 
    local cImage := SaveScreen()
    local cColors := SetColor()
+   local cOs    := Upper( OS() )
+   local cShell := GetEnv("COMSPEC")
+   local bLastHandler := ErrorBlock({ |objErr| BREAK (objErr) })
+   local oE
 
    SET COLOR TO "W/N"
    CLS
    SetCursor( SC_NORMAL )
-   RUN "Command.com"
+
+   begin sequence
+      if At("WINDOWS", cOs) != 0 .OR. At("DOS", cOs) != 0 .OR. At("OS/2", cOs) != 0
+         RUN cShell
+
+      else
+         Alert( "Not implemented yet!" )
+
+      endif
+
+   recover using oE
+      Alert("Error: " + oE:description)
+
+   end sequence
+
+   ErrorBlock(bLastHandler)
+
    SetCursor( SC_NONE )
    RestScreen( ,,,, cImage )
    SetColor( cColors )