diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 159e906c06..c4a63ebf97 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,10 +8,18 @@
    2002-12-01 13:30 UTC+0100 Foo Bar <foo.bar@foobar.org>
 */
 
+2007-11-29 21:40 UTC+0100 Marek Paliwoda (mpaliwoda at interia pl)
+  * harbour/make_b32.bat
+  * harbour/make_vc.bat
+  * harbour/make_vcce.bat
+    * Take care of environment variables possibly modified
+      inside batch files. Should leave user environment space
+      in a consistent state.
+
 2007-11-29 01:26 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
    * contrib/mtpl_b32.bat
    * contrib/mtpl_vc.bat
-     + Clear the internal envvars used by these .bat files, to 
+     + Clear the internal envvars used by these .bat files, to
        not leave any junk after themselves.
 
 2007-11-28 18:30 UTC+0100 Marek Paliwoda (mpaliwoda at interia pl)
diff --git a/harbour/make_b32.bat b/harbour/make_b32.bat
index 3a99160f77..a02fb4a216 100644
--- a/harbour/make_b32.bat
+++ b/harbour/make_b32.bat
@@ -21,10 +21,18 @@ rem    set HB_SHOW_ERRORS=
 rem    set HB_MAKE_FLAGS=
 rem ---------------------------------------------------------------
 
+rem Save original environment variables
+if NOT "%HB_GT_LIB%"       == "" set HB_GT_LIB_SAV=%HB_GT_LIB%
+if NOT "%HB_CC_NAME%"      == "" set HB_CC_NAME_SAV=%HB_CC_NAME%
+if NOT "%HB_MAKE_PROGRAM%" == "" set HB_MAKE_PROGRAM_SAV=%HB_MAKE_PROGRAM%
+if NOT "%HB_SHOW_ERRORS%"  == "" set HB_SHOW_ERRORS_SAV=%HB_SHOW_ERRORS%
+
+rem Set environment variables to default values
 if "%HB_GT_LIB%"       == "" set HB_GT_LIB=gtwin
 if "%HB_CC_NAME%"      == "" set HB_CC_NAME=b32
 if "%HB_MAKE_PROGRAM%" == "" set HB_MAKE_PROGRAM=make.exe
 if "%HB_SHOW_ERRORS%"  == "" set HB_SHOW_ERRORS=yes
+
 set HB_MAKEFILE=make_%HB_CC_NAME%.mak
 
 rem ---------------------------------------------------------------
@@ -68,3 +76,15 @@ rem ---------------------------------------------------------------
 
 rem Restore user value
 set COPYCMD=%HB_ORGENV_COPYCMD%
+
+set HB_MAKEFILE=
+
+set HB_GT_LIB=%HB_GT_LIB_SAV%
+set HB_CC_NAME=%HB_CC_NAME_SAV%
+set HB_MAKE_PROGRAM=%HB_MAKE_PROGRAM_SAV%
+set HB_SHOW_ERRORS=%HB_SHOW_ERRORS_SAV%
+
+set HB_GT_LIB_SAV=
+set HB_CC_NAME_SAV=
+set HB_MAKE_PROGRAM_SAV=
+set HB_SHOW_ERRORS_SAV=
diff --git a/harbour/make_vc.bat b/harbour/make_vc.bat
index 4e3a548ecf..3c3ed3ecf2 100644
--- a/harbour/make_vc.bat
+++ b/harbour/make_vc.bat
@@ -21,10 +21,18 @@ rem    set HB_SHOW_ERRORS=
 rem    set HB_MAKE_FLAGS=
 rem ---------------------------------------------------------------
 
+rem Save original environment variables
+if NOT "%HB_GT_LIB%"       == "" set HB_GT_LIB_SAV=%HB_GT_LIB%
+if NOT "%HB_CC_NAME%"      == "" set HB_CC_NAME_SAV=%HB_CC_NAME%
+if NOT "%HB_MAKE_PROGRAM%" == "" set HB_MAKE_PROGRAM_SAV=%HB_MAKE_PROGRAM%
+if NOT "%HB_SHOW_ERRORS%"  == "" set HB_SHOW_ERRORS_SAV=%HB_SHOW_ERRORS%
+
+rem Set environment variables to default values
 if "%HB_GT_LIB%"       == "" set HB_GT_LIB=gtwin
 if "%HB_CC_NAME%"      == "" set HB_CC_NAME=vc
 if "%HB_MAKE_PROGRAM%" == "" set HB_MAKE_PROGRAM=nmake.exe
 if "%HB_SHOW_ERRORS%"  == "" set HB_SHOW_ERRORS=yes
+
 set HB_MAKEFILE=make_%HB_CC_NAME%.mak
 
 rem ---------------------------------------------------------------
@@ -68,3 +76,15 @@ rem ---------------------------------------------------------------
 
 rem Restore user value
 set COPYCMD=%HB_ORGENV_COPYCMD%
+
+set HB_MAKEFILE=
+
+set HB_GT_LIB=%HB_GT_LIB_SAV%
+set HB_CC_NAME=%HB_CC_NAME_SAV%
+set HB_MAKE_PROGRAM=%HB_MAKE_PROGRAM_SAV%
+set HB_SHOW_ERRORS=%HB_SHOW_ERRORS_SAV%
+
+set HB_GT_LIB_SAV=
+set HB_CC_NAME_SAV=
+set HB_MAKE_PROGRAM_SAV=
+set HB_SHOW_ERRORS_SAV=
diff --git a/harbour/make_vcce.bat b/harbour/make_vcce.bat
index ff00a8275e..edfbe38cd0 100644
--- a/harbour/make_vcce.bat
+++ b/harbour/make_vcce.bat
@@ -21,11 +21,21 @@ rem    set HB_MAKE_FLAGS=
 rem    set HB_CC_NAME=
 rem ---------------------------------------------------------------
 
+rem Save original environment variables
+if NOT "%HB_GT_LIB%"       == "" set HB_GT_LIB_SAV=%HB_GT_LIB%
+if NOT "%HB_CC_NAME%"      == "" set HB_CC_NAME_SAV=%HB_CC_NAME%
+if NOT "%HB_MAKE_PROGRAM%" == "" set HB_MAKE_PROGRAM_SAV=%HB_MAKE_PROGRAM%
+if NOT "%HB_SHOW_ERRORS%"  == "" set HB_SHOW_ERRORS_SAV=%HB_SHOW_ERRORS%
+if NOT "%HB_GT_DEFAULT%"   == "" set HB_GT_DEFAULT_SAV=%HB_GT_DEFAULT%
+if NOT "%C_USR%"           == "" set C_USR_SAV=%C_USR%
+
+rem Set environment variables to default values
 if "%HB_GT_LIB%"       == "" set HB_GT_LIB=gtwvt
 if "%HB_CC_NAME%"      == "" set HB_CC_NAME=vcce
-if "%HB_GT_DEFAULT%"   == "" set HB_GT_DEFAULT=wvt
 if "%HB_MAKE_PROGRAM%" == "" set HB_MAKE_PROGRAM=nmake.exe
 if "%HB_SHOW_ERRORS%"  == "" set HB_SHOW_ERRORS=yes
+if "%HB_GT_DEFAULT%"   == "" set HB_GT_DEFAULT=wvt
+
 set HB_MAKEFILE=make_%HB_CC_NAME%.mak
 
 set CFLAGS=%C_USR% -DHB_NO_WIN_CONSOLE
@@ -71,3 +81,19 @@ rem ---------------------------------------------------------------
 
 rem Restore user value
 set COPYCMD=%HB_ORGENV_COPYCMD%
+
+set HB_MAKEFILE=
+
+set HB_GT_LIB=%HB_GT_LIB_SAV%
+set HB_CC_NAME=%HB_CC_NAME_SAV%
+set HB_MAKE_PROGRAM=%HB_MAKE_PROGRAM_SAV%
+set HB_SHOW_ERRORS=%HB_SHOW_ERRORS_SAV%
+set HB_GT_DEFAULT=%HB_GT_DEFAULT_SAV%
+set C_USR=%C_USR_SAV%
+
+set HB_GT_LIB_SAV=
+set HB_CC_NAME_SAV=
+set HB_MAKE_PROGRAM_SAV=
+set HB_SHOW_ERRORS_SAV=
+set HB_GT_DEFAULT_SAV=
+set C_USR_SAV=