diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 25d5d15237..84217d5b37 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,18 @@
    2002-12-01 13:30 UTC+0100 Foo Bar <foo.bar@foobar.org>
 */
 
+2008-02-12 08:04 UTC+0100 Marek Paliwoda (mpaliwoda at interia pl)
+  * harbour/contrib/hbwhat32/make_gcc.sh
+    ! Fixed compilation under MingW and Cygwin
+
+  * harbour/contrib/make_b32_all.bat
+  * harbour/contrib/make_vc_all.bat
+    + Added hbwhat32 to a list of compiled contribs
+
+  * harbour/contrib/make_gcc_all.sh
+    - Removed hbzlib from a list of mandatory compiled contribs.
+      It still can be compiled conditionaly.
+
 2008-02-11 16:23 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   * harbour/contrib/xhb/wintypes.ch
     ! added missing => in #ytranslate command - thanks to Alex
@@ -28,7 +40,7 @@
    + source/lang/msguakoi.c
    + source/lang/msguawin.c
      + Added some msg files from xhb. Some problems corrected.
-       (Belarussian ISO code, long filename and internal ID 
+       (Belarussian ISO code, long filename and internal ID
        for HR1250)
 
 2008-02-09 22:42 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
diff --git a/harbour/contrib/hbwhat32/make_gcc.sh b/harbour/contrib/hbwhat32/make_gcc.sh
index 0593942308..88056b0ac7 100755
--- a/harbour/contrib/hbwhat32/make_gcc.sh
+++ b/harbour/contrib/hbwhat32/make_gcc.sh
@@ -3,5 +3,6 @@
 #
 # $Id$
 #
-
+export HARBOURFLAGS="-I../xhb"
 ../mtpl_gcc.sh $1 $2 $3 $4 $5 $6 $7 $8 $9
+unset HARBOURFLAGS
diff --git a/harbour/contrib/make_b32_all.bat b/harbour/contrib/make_b32_all.bat
index 7ad70e16ff..facc131475 100644
--- a/harbour/contrib/make_b32_all.bat
+++ b/harbour/contrib/make_b32_all.bat
@@ -42,7 +42,7 @@ rem *******************************************************
 set _HB_DIRS=rddado hbbmcdx hbbtree gtwvg hbct hbgt hbmisc hbnf hbmsql
 for %%n in ( %_HB_DIRS% ) do %COMSPEC% /c %__BATWORKER__% %%n %1 %2 %3 %4 %5 %6 %7 %8 %9
 
-set _HB_DIRS=hbole hbziparch hbodbc hbtpathy hbtip hbw32 xhb
+set _HB_DIRS=hbole hbziparch hbodbc hbtpathy hbtip hbw32 hbwhat32 xhb
 for %%n in ( %_HB_DIRS% ) do %COMSPEC% /c %__BATWORKER__% %%n %1 %2 %3 %4 %5 %6 %7 %8 %9
 
 set _HB_DIRS=hbclipsm hbw32ddr
diff --git a/harbour/contrib/make_gcc_all.sh b/harbour/contrib/make_gcc_all.sh
index 7ff969006c..6784d32b30 100755
--- a/harbour/contrib/make_gcc_all.sh
+++ b/harbour/contrib/make_gcc_all.sh
@@ -38,7 +38,7 @@ fi
 
 #**************************************************************
 
-_HB_DIRS="hbbmcdx hbbtree hbclipsm hbct hbgt hbmisc hbmsql hbnf hbtip hbtpathy hbzlib xhb"
+_HB_DIRS="hbbmcdx hbbtree hbclipsm hbct hbgt hbmisc hbmsql hbnf hbtip hbtpathy xhb"
 
 case "$HB_ARCHITECTURE" in
    w32|cyg|os2)
diff --git a/harbour/contrib/make_vc_all.bat b/harbour/contrib/make_vc_all.bat
index 94f4349ca6..796c80856b 100644
--- a/harbour/contrib/make_vc_all.bat
+++ b/harbour/contrib/make_vc_all.bat
@@ -42,7 +42,7 @@ rem *******************************************************
 set _HB_DIRS=rddado hbbmcdx hbbtree gtwvg hbct hbgt hbmisc hbnf hbmsql
 for %%n in ( %_HB_DIRS% ) do %COMSPEC% /c %__BATWORKER__% %%n %1 %2 %3 %4 %5 %6 %7 %8 %9
 
-set _HB_DIRS=hbole hbziparch hbodbc hbtpathy hbtip hbw32 xhb
+set _HB_DIRS=hbole hbziparch hbodbc hbtpathy hbtip hbw32 hbwhat32 xhb
 for %%n in ( %_HB_DIRS% ) do %COMSPEC% /c %__BATWORKER__% %%n %1 %2 %3 %4 %5 %6 %7 %8 %9
 
 set _HB_DIRS=hbclipsm hbw32ddr