diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index cb64bd3c3a..5170397dc2 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -1,6 +1,19 @@
+2000-07-12 12:30 UTC-0400 David G. Holm <dholm@jsd-llc.com>
+
+   * config/c.cf
+     * Changed to force flex to run before gcc, but after bison.
+
+   * source/compiler/Makefile
+     + Added test for HB_LEX being equal to SIMPLEX to compile
+       Harbour with SimpLex. If HB_LEX is missing or is set to
+       any value other than SIMPLEX, then Lex/Flex is used.
+
 20000712-18:18 GMT+2 Maurilio Longo <maurilio.longo@libero.it>
 
-
+   * source\compiler\Makefile
+     + added hbslex.c and changed to remove flex usage
+   * config\c.cf
+     * changed to force bison to run before gcc
 
 2000-07-12 16:08 GMT+3 Alexander Kresin <alex@belacy.belgorod.su>
     * source/rdd/dbf1.c
diff --git a/harbour/config/c.cf b/harbour/config/c.cf
index 0fb9a23433..85d94a9110 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 = $(YACC_OBJ) $(C_OBJS) $(C_MAIN_OBJ) $(LEX_OBJ)
+ALL_C_OBJS = $(YACC_OBJ) $(LEX_OBJ) $(C_OBJS) $(C_MAIN_OBJ)
 
 $(YACC_OBJ) : $(YACC_C)
 
diff --git a/harbour/source/compiler/Makefile b/harbour/source/compiler/Makefile
index 607c8b3ce3..c2ade0a077 100644
--- a/harbour/source/compiler/Makefile
+++ b/harbour/source/compiler/Makefile
@@ -14,12 +14,19 @@ YACC_HEADERS=\
 	hberrors.h \
 	hbpp.h
 
-#LEX_SOURCE=harbour.l
+ifeq ($(HB_LEX),SIMPLEX)
 
-#LEX_HEADERS=\
-#	hbsetup.h \
-#	hberrors.h \
-#	hbdefs.h
+C_EXTRA=hbslex.c
+
+else
+
+LEX_SOURCE=harbour.l
+
+LEX_HEADERS=\
+	hbsetup.h \
+	hberrors.h \
+	hbdefs.h
+endif
 
 C_SOURCES=\
 	cmdcheck.c \
@@ -33,10 +40,10 @@ C_SOURCES=\
 	hbusage.c \
 	hbfix.c \
 	hbident.c \
-	hbslex.c \
 	expropta.c \
 	exproptb.c \
 	exproptc.c \
+	$(C_EXTRA)
 
 C_MAIN=harbour.c