diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 74b9c7e936..954ef16940 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,13 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2011-08-19 15:01 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)
+  * contrib/hbide/ideenviron.prg
+    * Auto Detection: if hbide.exe is accompanied by hbmk2.exe,
+      and no environment is set, attempt is made to set path 
+      of Harbour installation automatically. I do not know
+      the logic foe *.nix systems, please fix.
+ 
 2011-08-18 14:12 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * contrib/rddsql/sqlbase.c
     ! fixed transfering records between two "array" SQLBASE workareas, when there 
diff --git a/harbour/contrib/hbide/ideenviron.prg b/harbour/contrib/hbide/ideenviron.prg
index 446447cca8..1f21f7ae3e 100644
--- a/harbour/contrib/hbide/ideenviron.prg
+++ b/harbour/contrib/hbide/ideenviron.prg
@@ -201,7 +201,7 @@ METHOD IdeEnvironments:getHbmk2Commands( cEnvName )
 /*------------------------------------------------------------------------*/
 
 METHOD IdeEnvironments:prepareBatch( cEnvName )
-   LOCAL n, s, a_, aCmd := {}
+   LOCAL cPath, n, s, a_, aCmd := {}
 
    IF ( n := ascan( ::aEnvrns, {|e_| e_[ 1 ] == cEnvName } ) ) > 0
       FOR EACH a_ IN ::aEnvrns[ n, 2 ]
@@ -210,6 +210,11 @@ METHOD IdeEnvironments:prepareBatch( cEnvName )
             aadd( aCmd, a_[ 2 ] )
          ENDIF
       NEXT
+   ELSE
+      hb_fNameSplit( hb_dirBase(), @cPath )
+      IF hb_fileExists( cPath + hb_ps() + "hbmk2.exe" )
+         aadd( aCmd, "SET PATH=" + cPath + ";%PATH%" )
+      ENDIF
    ENDIF
 
    RETURN hbide_getShellCommandsTempFile( aCmd )