diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 07a53b0d14..92913e0c48 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-04 20:39 UTC+0100 Marek Paliwoda (mpaliwoda at interia pl)
+  * harbour/contrib/make_b32_all.bat
+  * harbour/contrib/make_vc_all.bat
+    ! Fixed argument handling in created "worker bat file"
+
 2007-12-04 17:04 UTC+0100 Marek Paliwoda (mpaliwoda at interia pl)
   * harbour/make_b32.mak
   * harbour/make_vc.mak
diff --git a/harbour/contrib/make_b32_all.bat b/harbour/contrib/make_b32_all.bat
index 2d2676d91c..7008358a50 100644
--- a/harbour/contrib/make_b32_all.bat
+++ b/harbour/contrib/make_b32_all.bat
@@ -17,11 +17,13 @@ rem *******************************************************
 set __BATWORKER__=_hbwrk_.bat
 
 echo @echo off                                          >%__BATWORKER__%
+echo if %%1x == x goto EXIT                            >>%__BATWORKER__%
 echo if not exist %%1\make_b32.bat goto EXIT           >>%__BATWORKER__%
 echo echo Entering: %%1                                >>%__BATWORKER__%
 echo cd %%1                                            >>%__BATWORKER__%
 echo call make_b32.bat %%2 %%3 %%4 %%5 %%6 %%7 %%8 %%9 >>%__BATWORKER__%
 echo cd ..                                             >>%__BATWORKER__%
+echo :EXIT                                             >>%__BATWORKER__%
 
 rem *******************************************************
 rem Compiling contrib dirs ...
diff --git a/harbour/contrib/make_vc_all.bat b/harbour/contrib/make_vc_all.bat
index 0b594dc0b1..983549bd11 100644
--- a/harbour/contrib/make_vc_all.bat
+++ b/harbour/contrib/make_vc_all.bat
@@ -16,12 +16,14 @@ rem *******************************************************
 
 set __BATWORKER__=_hbwrk_.bat
 
-echo @echo off                                         >%__BATWORKER__%
-echo if not exist %%1\make_vc.bat goto EXIT           >>%__BATWORKER__%
-echo echo Entering: %%1                               >>%__BATWORKER__%
-echo cd %%1                                           >>%__BATWORKER__%
-echo call make_vc.bat %%2 %%3 %%4 %%5 %%6 %%7 %%8 %%9 >>%__BATWORKER__%
-echo cd ..                                            >>%__BATWORKER__%
+echo @echo off                                          >%__BATWORKER__%
+echo if %%1x == x goto EXIT                            >>%__BATWORKER__%
+echo if not exist %%1\make_vc.bat goto EXIT            >>%__BATWORKER__%
+echo echo Entering: %%1                                >>%__BATWORKER__%
+echo cd %%1                                            >>%__BATWORKER__%
+echo call make_vc.bat %%2 %%3 %%4 %%5 %%6 %%7 %%8 %%9  >>%__BATWORKER__%
+echo cd ..                                             >>%__BATWORKER__%
+echo :EXIT                                             >>%__BATWORKER__%
 
 rem *******************************************************
 rem Compiling contrib dirs ...