diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 063c48a44f..6c838641ec 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,10 @@
    2002-12-01 23:12 UTC+0100 Foo Bar <foo.bar@foobar.org>
 */
    * contrib/libmisc/Makefile
+    * Removed the Lib prefix from library name
+   * contrib/libgt/Makefile.bc
+     contrib/libgt/Makefile.vc
+     contrib/libgt/Make_vc.bat
      contrib/libgt/Make_b32.bat
     * Added the Lib prefix from library name
     + contrib/htmllib/*.prg
@@ -113,7 +117,8 @@
        low and Harbour level functions.
      * Cleaned up the new Win32 API branches.
 
-     * Renamed to ChangeLog.012 and started an new one   * source/pp/pragma.c
+2001-12-21 12:54 UTC+0100 Antonio Linares <alinares@fivetech.com>
+   * source/pp/pragma.c
    * contrib/dot/pp_harb.ch
    * tests/inline_c.prg
      * STOPDUMP renamed as ENDDUMP (with Ron permission)
diff --git a/harbour/utils/hbmake/hbmake.prg b/harbour/utils/hbmake/hbmake.prg
index d157f433da..b72aedff7b 100644
--- a/harbour/utils/hbmake/hbmake.prg
+++ b/harbour/utils/hbmake/hbmake.prg
@@ -1263,7 +1263,7 @@ if lBcc
  Fwrite( nLinkHandle, "IFLAGS = " +CRLF)
  Fwrite( nLinkHandle, "LINKER = ilink32"+CRLF)
  Fwrite( nLinkHandle, " "+CRLF)
- Fwrite( nLinkHandle, "ALLOBJ = " +if(lFwh,"c0w32.obj","c0x32.obj")+ " $(OBJFILES)"+CRLF)
+ Fwrite( nLinkHandle, "ALLOBJ = " +if(lFwh,"c0w32.obj","c0x32.obj")+ " $(OBJFILES)" + if(lextended," $(OBJCFILES)"," ")+CRLF)
  Fwrite( nLinkHandle, "ALLRES = $(RESFILES)"+CRLF)
  Fwrite( nLinkHandle, "ALLLIB = $(LIBFILES) import32.lib cw32.lib"+CRLF)
  Fwrite( nLinkHandle, ".autodepend"+CRLF)
@@ -1275,7 +1275,7 @@ elseif lVcc
  Fwrite( nLinkHandle, "IFLAGS = "+CRLF)
  Fwrite( nLinkHandle, "LINKER = link"+CRLF)
  Fwrite( nLinkHandle, " "+CRLF)
- Fwrite( nLinkHandle, "ALLOBJ = "+if(lCw,"$(C4W)\initc.obj","")+"$(OBJFILES)"+CRLF)
+ Fwrite( nLinkHandle, "ALLOBJ = "+if(lCw,"$(C4W)\initc.obj","")+"$(OBJFILES)" + if(lextended," $(OBJCFILES)"," ")+CRLF)
  Fwrite( nLinkHandle, "ALLRES = $(RESFILES)"+CRLF)
  Fwrite( nLinkHandle, "ALLLIB = $(LIBFILES) comdlg32.lib shell32.lib user32.lib gdi32.lib"+CRLF)
 
@@ -1287,7 +1287,7 @@ elseif lGcc
  Fwrite( nLinkHandle, "IFLAGS = "+CRLF)
  Fwrite( nLinkHandle, "LINKER = gcc"+CRLF)
  Fwrite( nLinkHandle, " "+CRLF)
- Fwrite( nLinkHandle, "ALLOBJ = $(OBJFILES) "+CRLF)
+ Fwrite( nLinkHandle, "ALLOBJ = $(OBJFILES) "+ if(lextended," $(OBJCFILES)"," ") +CRLF)
  Fwrite( nLinkHandle, "ALLRES = $(RESFILES) "+CRLF)
  Fwrite( nLinkHandle, "ALLLIB = $(LIBFILES) "+CRLF)
  Fwrite( nLinkHandle, ".autodepend"+CRLF)
@@ -1891,7 +1891,7 @@ elseif lVcc
  Fwrite( nLinkHandle, "IFLAGS = "+CRLF)
  Fwrite( nLinkHandle, "LINKER = lib $(PROJECT)"+CRLF)
  Fwrite( nLinkHandle, " "+CRLF)
- Fwrite( nLinkHandle, "ALLOBJ = "+CRLF)
+ Fwrite( nLinkHandle, "ALLOBJ = $(OBJFILES) $(OBJCFILES) "+CRLF)
  Fwrite( nLinkHandle, "ALLRES = $(RESFILES)"+CRLF)
  Fwrite( nLinkHandle, "ALLLIB = "+CRLF)