diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 5524ba68d2..e6e6c7eaff 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,12 @@
    2002-12-01 13:30 UTC+0100 Foo Bar <foo.bar@foobar.org>
 */
 
+2007-08-24 20:35 UTC+0100 Marek Paliwoda (mpaliwoda at interia pl)
+  * harbour/makefile.gc
+     ! Fixed compilation of hbverfix
+  * harbour/make_gcc.gc
+     * Changed the way CC and LD envvars are set
+
 2007-08-24 14:22 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   + harbour/debian/hbdot.1
   * harbour/debian/rules
@@ -198,11 +204,11 @@
 
 2007-08-20 17:42 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
    * source/rtl/tget.prg
-     ! Recent missing date picture mask bug fixed in another 
-       different way. Now without any side-effects, tested with 
+     ! Recent missing date picture mask bug fixed in another
+       different way. Now without any side-effects, tested with
        the regression test suit.
      ! Fixed a minor incompatibility in some rare situations.
-       This is grey area even in C5.2 so compatibility is not 100% 
+       This is grey area even in C5.2 so compatibility is not 100%
        here.
 
 2007-08-20 15:50 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
@@ -243,11 +249,11 @@
 
 2007-08-20 04:03 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
    * source/rtl/tget.prg
-     ! Fixed incompatible setting of ::TypeOut in certain 
-       situations. As an example this could cause infinite 
-       loops in the get reader when a bad date was entered 
+     ! Fixed incompatible setting of ::TypeOut in certain
+       situations. As an example this could cause infinite
+       loops in the get reader when a bad date was entered
        like: 2007.12.32 (very old bug)
-     ! Recent missing date picture mask bug fixed in a different 
+     ! Recent missing date picture mask bug fixed in a different
        way, because the previous one caused some regressions.
      ! Fixed ::TypeOut behaviour for non-editable types.
 
diff --git a/harbour/make_gcc.sh b/harbour/make_gcc.sh
index 970b90f353..288a80b315 100755
--- a/harbour/make_gcc.sh
+++ b/harbour/make_gcc.sh
@@ -63,8 +63,9 @@ then
     esac
 fi
 
-CC="gcc"
-LD="gcc"
+[ -z "$CC" ] && CC="gcc"
+[ -z "$LD" ] && LD="gcc"
+
 MAKE="make"
 EXEEXT=""
 CRSLIB="ncurses"
diff --git a/harbour/makefile.gc b/harbour/makefile.gc
index c182579419..8446a32050 100644
--- a/harbour/makefile.gc
+++ b/harbour/makefile.gc
@@ -367,7 +367,7 @@ $(HBMAKE_EXE)   :: $(HBMAKE_EXE_OBJS)
 #**********************************************************
 $(HBVER_EXE)    :: $(StdLibs)
 $(HBVER_EXE)    :: $(HBVER_EXE_OBJS)
-	$(CC) $(CFLAGS) -o$@ $^ $(LDFLAGS)
+	$(CC) $(CFLAGS) -o$@ $^ $(HB_OS_LIBS)
 #**********************************************************