diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index fd8ebe2b99..84bdedd41c 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,19 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2010-07-05 22:24 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * contrib/makefile.hbs
+  * utils/hbmk2/hbmk2.prg
+    - Deleted support for compatibility hbmk/hbmk2/bld.bat envvars below:
+      - HB_MT
+      - HB_GUI
+      - HB_SHARED
+      - HB_DEBUG
+      - HB_NULRDD
+      - HB_GT
+      INCOMPATIBILITY. Use HBMK_OPTION envvar instead with regular
+      hbmk2 options: 'HBMK_OPTION=-mt -gui' etc.
+
 2010-07-05 22:17 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * utils/hbmk2/hbmk2.prg
     + -instfile will now only copy changed files in -inc mode.
diff --git a/harbour/contrib/makefile.hbs b/harbour/contrib/makefile.hbs
index 48d1d72e66..6ac0c46ec4 100644
--- a/harbour/contrib/makefile.hbs
+++ b/harbour/contrib/makefile.hbs
@@ -246,14 +246,6 @@ PROCEDURE Main( ... )
 
    hb_setenv( "HBMK_OPTIONS" )
 
-   /* compatibility ones. */
-   hb_setenv( "HB_MT" )
-   hb_setenv( "HB_GUI" )
-   hb_setenv( "HB_SHARED" )
-   hb_setenv( "HB_DEBUG" )
-   hb_setenv( "HB_NULRDD" )
-   hb_setenv( "HB_GT" )
-
    /* Parse filter */
 
    aFilter := iif( Empty( cFilter ), {}, hb_ATokens( cFilter,, .T. ) )
diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg
index 760e77345b..84834cfedd 100644
--- a/harbour/utils/hbmk2/hbmk2.prg
+++ b/harbour/utils/hbmk2/hbmk2.prg
@@ -875,34 +875,6 @@ FUNCTION hbmk2( aArgs, /* @ */ lPause )
 
    /* Compatibility */
 
-   IF ValueIsT( GetEnv( "HB_MT" ) ) .OR. Lower( GetEnv( "HB_MT" ) ) == "mt"
-      cEnv += " -mt"
-   ELSEIF ValueIsF( GetEnv( "HB_MT" ) )
-      cEnv += " -st"
-   ENDIF
-   IF ValueIsT( GetEnv( "HB_GUI" ) )
-      cEnv += " -gui"
-   ELSEIF ValueIsF( GetEnv( "HB_GUI" ) )
-      cEnv += " -std"
-   ENDIF
-   IF ValueIsT( GetEnv( "HB_SHARED" ) )
-      cEnv += " -shared"
-   ELSEIF ValueIsF( GetEnv( "HB_SHARED" ) )
-      cEnv += " -static"
-   ENDIF
-   IF ValueIsT( GetEnv( "HB_DEBUG" ) )
-      cEnv += " -debug"
-   ELSEIF ValueIsF( GetEnv( "HB_DEBUG" ) )
-      cEnv += " -debug-"
-   ENDIF
-   IF ValueIsT( GetEnv( "HB_NULRDD" ) )
-      cEnv += " -nulrdd"
-   ELSEIF ValueIsF( GetEnv( "HB_NULRDD" ) )
-      cEnv += " -nulrdd-"
-   ENDIF
-   IF Lower( Left( GetEnv( "HB_GT" ), 2 ) ) == "gt"
-      cEnv += " -" + GetEnv( "HB_GT" )
-   ENDIF
    FOR EACH tmp IN ListToArray( PathSepToSelf( GetEnv( "HB_USER_LIBPATHS" ) ) )
       cEnv += " -L" + tmp
    NEXT