diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 3b9125200c..3acf38e938 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,11 @@
    2002-12-01 13:30 UTC+0100 Foo Bar <foo.bar@foobar.org>
 */
 
+2007-12-01 20:12 UTC+0100 Marek Paliwoda (mpaliwoda at interia pl)
+  * harbour/make_vcce.bat
+    + Added existence verification of HB and HBPPGEN environment
+      variables and existence of files which are pointed by them
+
 2007-12-01 20:30 UTC+0200 Mindaugas Kavaliauskas (dbtopas/at/dbtopas.lt)
   + harbour/source/lang/msgltwin.c
   * harbour/source/lang/Makefile
diff --git a/harbour/make_vcce.bat b/harbour/make_vcce.bat
index 92e2a2bc9a..d62f112744 100644
--- a/harbour/make_vcce.bat
+++ b/harbour/make_vcce.bat
@@ -21,6 +21,32 @@ rem    set HB_MAKE_FLAGS=
 rem    set HB_CC_NAME=
 rem ---------------------------------------------------------------
 
+if not "%HB%" == "" if exist %HB% goto CHECK_HBPPGEN
+   echo.
+   echo *******************************************
+   echo You must set HB environment variable to a
+   echo working copy of Harbour compiler executable
+   echo harbour.exe.
+   echo. Example : set HB=C:\Harbour\harbour.exe
+   echo *******************************************
+   echo.
+   goto EXIT
+
+:CHECK_HBPPGEN
+if not "%HBPPGEN%" == "" if exist %HBPPGEN% goto COMPILE
+   echo.
+   echo **********************************************
+   echo You must set HBPPGEN environment variable to a
+   echo working copy of hbppgen.exe helper executable
+   echo. Example : set HB=C:\Harbour\hbppgen.exe
+   echo **********************************************
+   echo.
+   goto EXIT
+
+rem ---------------------------------------------------------------
+
+:COMPILE
+
 set _HB_CC_NAME=%HB_CC_NAME%
 set _HB_MAKE_PROGRAM=%HB_MAKE_PROGRAM%