diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 699643fc92..cb64bd3c3a 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -1,3 +1,7 @@
+20000712-18:18 GMT+2 Maurilio Longo <maurilio.longo@libero.it>
+
+
+
 2000-07-12 16:08 GMT+3 Alexander Kresin <alex@belacy.belgorod.su>
     * source/rdd/dbf1.c
       * fixed a bug in dbfUpdateRecord() which caused problems with
@@ -22,10 +26,10 @@
 
     *source/common/hash.c
         * items can be removed from the hash table
-        
+
     *source/compiler/harbour.l
         * fixed handling of 'with()' and '( with )' syntax
-        
+
     *tests/keywords.prg
         * updated with few additional tests
 
@@ -45,23 +49,23 @@
      ! Fixed PP dependency for HARBOUR.EXE
 
    * source/pp/ppcore.c
-   * source/rdd/dbfntx/dbfntx1.c 
+   * source/rdd/dbfntx/dbfntx1.c
      - Removed // comments
 
-   * source/rdd/dbfntx/dbfntx1.c 
+   * source/rdd/dbfntx/dbfntx1.c
      ! Fixed some BCC warnings.
 
    * source/rdd/dbcmd.c
    * source/rtl/disksphb.c
-   * source/rtl/errorapi.c 
+   * source/rtl/errorapi.c
    * source/rtl/tget.prg
      * Formatting
 
    * utils/hbdoc/Makefile
      ! Fixed TAB
 
-   * utils/hbextern/hbextern.prg 
-   * utils/hbtest/rt_misc.prg 
+   * utils/hbextern/hbextern.prg
+   * utils/hbtest/rt_misc.prg
      * = assigments -> :=
 
    * include/hbcomp.h
@@ -71,7 +75,7 @@
      - Removed HB_NESTED_COMPILE.
 
    - include/hbstruc.ch
-   - source/rtl/hbstruc.prg 
+   - source/rtl/hbstruc.prg
      - Removed.
 
 2000-07-11 09:30 UTC+0800 Ron Pinkas <ron@profit-master.com>
diff --git a/harbour/config/c.cf b/harbour/config/c.cf
index 46719adfb9..0fb9a23433 100644
--- a/harbour/config/c.cf
+++ b/harbour/config/c.cf
@@ -23,7 +23,7 @@ LEX_OBJ = $(LEX_C:.c=$(OBJ_EXT))
 LEX_HB_H := $(foreach h, $(LEX_HEADERS), $(HB_INC_COMPILE)/$(h))
 endif
 
-ALL_C_OBJS = $(C_OBJS) $(C_MAIN_OBJ) $(YACC_OBJ) $(LEX_OBJ)
+ALL_C_OBJS = $(YACC_OBJ) $(C_OBJS) $(C_MAIN_OBJ) $(LEX_OBJ)
 
 $(YACC_OBJ) : $(YACC_C)
 
diff --git a/harbour/source/compiler/Makefile b/harbour/source/compiler/Makefile
index de15fa0a95..607c8b3ce3 100644
--- a/harbour/source/compiler/Makefile
+++ b/harbour/source/compiler/Makefile
@@ -14,12 +14,12 @@ YACC_HEADERS=\
 	hberrors.h \
 	hbpp.h
 
-LEX_SOURCE=harbour.l
+#LEX_SOURCE=harbour.l
 
-LEX_HEADERS=\
-	hbsetup.h \
-	hberrors.h \
-	hbdefs.h
+#LEX_HEADERS=\
+#	hbsetup.h \
+#	hberrors.h \
+#	hbdefs.h
 
 C_SOURCES=\
 	cmdcheck.c \
@@ -33,6 +33,7 @@ C_SOURCES=\
 	hbusage.c \
 	hbfix.c \
 	hbident.c \
+	hbslex.c \
 	expropta.c \
 	exproptb.c \
 	exproptc.c \