diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 34c39032a2..ae7d5dde70 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -1,3 +1,9 @@
+2000-08-30 00:19 UTC+0100 Victor Szakats <info@szelvesz.hu>
+
+   * makefile.vc
+   * makefile.bc
+     + GTCGI added to the make process.
+
 2000-08-30 10:48 GMT+1 Bruno Cantero <bruno@issnet.net>
   * source/rdd/dbf1.c
     * Fixed two warning.
diff --git a/harbour/makefile.bc b/harbour/makefile.bc
index 1b630bee6e..2f84f306ba 100644
--- a/harbour/makefile.bc
+++ b/harbour/makefile.bc
@@ -113,6 +113,7 @@ RDD_LIB      = $(LIB_DIR)\rdd.lib
 RTL_LIB      = $(LIB_DIR)\rtl.lib
 VM_LIB       = $(LIB_DIR)\vm.lib
 
+GTCGI_LIB    = $(LIB_DIR)\gtcgi.lib
 GTDOS_LIB    = $(LIB_DIR)\gtdos.lib
 GTPCA_LIB    = $(LIB_DIR)\gtpca.lib
 GTSTD_LIB    = $(LIB_DIR)\gtstd.lib
@@ -131,6 +132,7 @@ HBDOC_EXE    = $(BIN_DIR)\hbdoc.exe
 !if $d(B16)
 
 HB_GT_LIBS = \
+   $(GTCGI_LIB) \
    $(GTDOS_LIB) \
    $(GTPCA_LIB) \
    $(GTSTD_LIB)
@@ -146,6 +148,7 @@ HB_GT_LIB = $(LIB_DIR)\$(HB_GT_LIB).lib
 # TODO: Add GTSLN and GTCRS
 
 HB_GT_LIBS = \
+   $(GTCGI_LIB) \
    $(GTPCA_LIB) \
    $(GTSTD_LIB) \
    $(GTWIN_LIB)
@@ -483,6 +486,14 @@ VM_LIB_OBJS = $(VM_LIB_OBJS) \
    $(OBJ_DIR)\startup.obj
 !endif
 
+#
+# GTCGI.LIB rules
+#
+
+GTCGI_LIB_OBJS = \
+   $(OBJ_DIR)\gtcgi.obj \
+   $(OBJ_DIR)\mousecgi.obj
+
 #
 # GTDOS.LIB rules
 #
@@ -625,6 +636,7 @@ $(PP_LIB)     : $(PP_LIB_OBJS)
 $(RDD_LIB)    : $(RDD_LIB_OBJS)
 $(RTL_LIB)    : $(RTL_LIB_OBJS)
 $(VM_LIB)     : $(VM_LIB_OBJS)
+$(GTCGI_LIB)  : $(GTCGI_LIB_OBJS)
 $(GTDOS_LIB)  : $(GTDOS_LIB_OBJS)
 $(GTPCA_LIB)  : $(GTPCA_LIB_OBJS)
 $(GTSTD_LIB)  : $(GTSTD_LIB_OBJS)
@@ -1954,6 +1966,18 @@ $(OBJ_DIR)\tbrwtext.obj : $(OBJ_DIR)\tbrwtext.c
    $(CC) $(CLIBFLAGS) -o$@ $**
    tlib $(DEBUG_LIB) $(ARFLAGS) -+$@,,
 
+#
+# GTCGI.LIB dependencies
+#
+
+$(OBJ_DIR)\gtcgi.obj : $(RTL_DIR)\gtcgi\gtcgi.c
+   $(CC) $(CLIBFLAGS) -o$@ $**
+   tlib $(GTCGI_LIB) $(ARFLAGS) -+$@,,
+
+$(OBJ_DIR)\mousecgi.obj : $(RTL_DIR)\gtcgi\mousecgi.c
+   $(CC) $(CLIBFLAGS) -o$@ $**
+   tlib $(GTCGI_LIB) $(ARFLAGS) -+$@,,
+
 #
 # GTDOS.LIB dependencies
 #
diff --git a/harbour/makefile.vc b/harbour/makefile.vc
index 40df052ca8..0b38673ff8 100644
--- a/harbour/makefile.vc
+++ b/harbour/makefile.vc
@@ -102,6 +102,7 @@ RDD_LIB      = $(LIB_DIR)\rdd.lib
 RTL_LIB      = $(LIB_DIR)\rtl.lib
 VM_LIB       = $(LIB_DIR)\vm.lib
 
+GTCGI_LIB    = $(LIB_DIR)\gtcgi.lib
 GTPCA_LIB    = $(LIB_DIR)\gtpca.lib
 GTSTD_LIB    = $(LIB_DIR)\gtstd.lib
 GTWIN_LIB    = $(LIB_DIR)\gtwin.lib
@@ -568,6 +569,17 @@ VM_LIB_OBJS = \
    \
    $(OBJ_DIR)\harbinit.obj
 
+#
+# GTCGI.LIB rules
+#
+
+{$(RTL_DIR)\gtcgi}.c{$(OBJ_DIR)}.obj::
+   $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $<
+
+GTCGI_LIB_OBJS = \
+   $(OBJ_DIR)\gtcgi.obj \
+   $(OBJ_DIR)\mousecgi.obj
+
 #
 # GTPCA.LIB rules
 #
@@ -621,6 +633,7 @@ all: zot \
    $(NULSYS_LIB) \
    $(DBFNTX_LIB) \
    $(DBFCDX_LIB) \
+   $(GTCGI_LIB) \
    $(GTPCA_LIB) \
    $(GTSTD_LIB) \
    $(GTWIN_LIB) \
@@ -653,6 +666,7 @@ all: \
    $(NULSYS_LIB) \
    $(DBFNTX_LIB) \
    $(DBFCDX_LIB) \
+   $(GTCGI_LIB) \
    $(GTPCA_LIB) \
    $(GTSTD_LIB) \
    $(GTWIN_LIB) \
@@ -785,6 +799,9 @@ $(NULSYS_LIB) : $(NULSYS_LIB_OBJS)
 $(VM_LIB) : $(VM_LIB_OBJS)
    lib /out:$@ $**
 
+$(GTCGI_LIB) : $(GTCGI_LIB_OBJS)
+   lib /out:$@ $**
+
 $(GTPCA_LIB) : $(GTPCA_LIB_OBJS)
    lib /out:$@ $**
 
@@ -835,6 +852,7 @@ $(DBFCDX_LIB)2 : $(DBFCDX_LIB_OBJS)
 $(DBFNTX_LIB)2 : $(DBFNTX_LIB_OBJS)
 $(NULSYS_LIB)2 : $(NULSYS_LIB_OBJS)
 $(VM_LIB)2     : $(VM_LIB_OBJS)
+$(GTCGI_LIB)2  : $(GTCGI_LIB_OBJS)
 $(GTPCA_LIB)2  : $(GTPCA_LIB_OBJS)
 $(GTSTD_LIB)2  : $(GTSTD_LIB_OBJS)
 $(GTWIN_LIB)2  : $(GTWIN_LIB_OBJS)