diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index d5ec0b377b..7b8269ae9b 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,15 @@
    2002-12-01 13:30 UTC+0100 Foo Bar <foo.bar@foobar.org>
 */
 
+2007-07-18 16:43 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
+  * harbour/contrib/libct/Makefile
+  * harbour/contrib/libct/makefile.bc
+  * harbour/contrib/libct/makefile.vc
+    * added new files and Juan Gálvez fixes
+  * harbour/contrib/libct/like.c
+  * harbour/contrib/libct/keyset.c
+    ! fixed typo
+
 2007-07-18 16:25 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   * harbour/tests/gtchars.prg
   * harbour/tests/gtcolors.prg
diff --git a/harbour/contrib/libct/Makefile b/harbour/contrib/libct/Makefile
index ddbd85ca99..d960485e93 100644
--- a/harbour/contrib/libct/Makefile
+++ b/harbour/contrib/libct/Makefile
@@ -45,6 +45,7 @@ C_SOURCES = \
 	ftoc.c \
 	justify.c \
 	keyset.c \
+	like.c \
 	misc1.c \
 	misc2.c \
 	misc3.c \
diff --git a/harbour/contrib/libct/keyset.c b/harbour/contrib/libct/keyset.c
index 3ac05f2f8f..de73fcea67 100644
--- a/harbour/contrib/libct/keyset.c
+++ b/harbour/contrib/libct/keyset.c
@@ -112,7 +112,6 @@ static void SetGet( char cKey )
 static void SetGet( char cKey )
 {
    BYTE kbBuffer[256];
-   BOOL bRetval;
    USHORT uKey = 0;
 
    switch( cKey )
@@ -126,11 +125,11 @@ static void SetGet( char cKey )
          break;
 
       case 0x40:
-         uKey = HB_VK_CAPITAL
+         uKey = HB_VK_CAPITAL;
          break;
 
       case 0x80:
-         uKey = HB_VK_INSERT
+         uKey = HB_VK_INSERT;
          break;
    }
 
diff --git a/harbour/contrib/libct/like.c b/harbour/contrib/libct/like.c
index 8633b7ccca..9111371f77 100644
--- a/harbour/contrib/libct/like.c
+++ b/harbour/contrib/libct/like.c
@@ -55,7 +55,7 @@
 
 HB_FUNC( LIKE )
 {
-   char * szPattern = hb_parc( 1 );
+   char * szPattern = hb_parc( 1 ),
         * szString  = hb_parc( 2 );
    hb_retl( szPattern && szString &&
             hb_strMatchWildExact( szString, szPattern ) );
diff --git a/harbour/contrib/libct/makefile.bc b/harbour/contrib/libct/makefile.bc
index 6fc83c7ae6..41e5ade664 100644
--- a/harbour/contrib/libct/makefile.bc
+++ b/harbour/contrib/libct/makefile.bc
@@ -117,7 +117,6 @@ TOOLS_LIB_OBJS = \
    $(OBJ_DIR)\ctchksum.obj \
    $(OBJ_DIR)\ctcrypt.obj \
    $(OBJ_DIR)\ctpad.obj \
-   $(OBJ_DIR)\cttime.obj \
    $(OBJ_DIR)\ctwfunc.obj \
    $(OBJ_DIR)\ctwin.obj \
    $(OBJ_DIR)\datetime.obj \
@@ -129,6 +128,7 @@ TOOLS_LIB_OBJS = \
    $(OBJ_DIR)\ftoc.obj \
    $(OBJ_DIR)\justify.obj \
    $(OBJ_DIR)\keyset.obj \
+   $(OBJ_DIR)\like.obj \
    $(OBJ_DIR)\misc1.obj \
    $(OBJ_DIR)\misc2.obj \
    $(OBJ_DIR)\misc3.obj \
@@ -156,6 +156,7 @@ TOOLS_LIB_OBJS = \
    \
    $(OBJ_DIR)\ct.obj \
    $(OBJ_DIR)\ctmisc.obj \
+   $(OBJ_DIR)\cttime.obj \
    $(OBJ_DIR)\numconv.obj \
    $(OBJ_DIR)\screen2.obj \
    $(OBJ_DIR)\setlast.obj \
@@ -245,7 +246,7 @@ $(OBJ_DIR)\charswap.obj : $(TOOLS_DIR)\charswap.c
    $(CC) $(CLIBFLAGS) -o$@ $**
    tlib $(TOOLS_LIB) $(ARFLAGS) -+$@,,
 
-$(OBJ_DIR)\color.obj : $(OBJ_DIR)\color.c
+$(OBJ_DIR)\color.obj : $(TOOLS_DIR)\color.c
    $(CC) $(CLIBFLAGS) -o$@ $**
    tlib $(TOOLS_LIB) $(ARFLAGS) -+$@,,
 
@@ -293,19 +294,15 @@ $(OBJ_DIR)\ctpad.obj : $(TOOLS_DIR)\ctpad.c
    $(CC) $(CLIBFLAGS) -o$@ $**
    tlib $(TOOLS_LIB) $(ARFLAGS) -+$@,,
 
-$(OBJ_DIR)\cttime.obj : $(TOOLS_DIR)\cttime.c
+$(OBJ_DIR)\datetime.obj : $(TOOLS_DIR)\datetime.c
    $(CC) $(CLIBFLAGS) -o$@ $**
    tlib $(TOOLS_LIB) $(ARFLAGS) -+$@,,
 
-$(OBJ_DIR)\datetime.obj : $(OBJ_DIR)\datetime.c
+$(OBJ_DIR)\dattime2.obj : $(TOOLS_DIR)\dattime2.c
    $(CC) $(CLIBFLAGS) -o$@ $**
    tlib $(TOOLS_LIB) $(ARFLAGS) -+$@,,
 
-$(OBJ_DIR)\dattime2.obj : $(OBJ_DIR)\dattime2.c
-   $(CC) $(CLIBFLAGS) -o$@ $**
-   tlib $(TOOLS_LIB) $(ARFLAGS) -+$@,,
-
-$(OBJ_DIR)\dbftools.obj : $(OBJ_DIR)\dbftools.c
+$(OBJ_DIR)\dbftools.obj : $(TOOLS_DIR)\dbftools.c
    $(CC) $(CLIBFLAGS) -o$@ $**
    tlib $(TOOLS_LIB) $(ARFLAGS) -+$@,,
 
@@ -333,6 +330,10 @@ $(OBJ_DIR)\keyset.obj : $(TOOLS_DIR)\keyset.c
    $(CC) $(CLIBFLAGS) -o$@ $**
    tlib $(TOOLS_LIB) $(ARFLAGS) -+$@,,
 
+$(OBJ_DIR)\like.obj : $(TOOLS_DIR)\like.c
+   $(CC) $(CLIBFLAGS) -o$@ $**
+   tlib $(TOOLS_LIB) $(ARFLAGS) -+$@,,
+
 $(OBJ_DIR)\misc1.obj : $(TOOLS_DIR)\misc1.c
    $(CC) $(CLIBFLAGS) -o$@ $**
    tlib $(TOOLS_LIB) $(ARFLAGS) -+$@,,
@@ -443,6 +444,13 @@ $(OBJ_DIR)\ctmisc.obj : $(OBJ_DIR)\ctmisc.c
    $(CC) $(CLIBFLAGS) -o$@ $**
    tlib $(TOOLS_LIB) $(ARFLAGS) -+$@,,
 
+$(OBJ_DIR)\cttime.c : $(TOOLS_DIR)\cttime.prg
+   $(HARBOUR_EXE) $(HARBOURFLAGS) $** -o$@
+
+$(OBJ_DIR)\cttime.obj : $(OBJ_DIR)\cttime.c
+   $(CC) $(CLIBFLAGS) -o$@ $**
+   tlib $(TOOLS_LIB) $(ARFLAGS) -+$@,,
+
 $(OBJ_DIR)\numconv.c : $(TOOLS_DIR)\numconv.prg
    $(HARBOUR_EXE) $(HARBOURFLAGS) $** -o$@
 
diff --git a/harbour/contrib/libct/makefile.vc b/harbour/contrib/libct/makefile.vc
index 0c5598c8da..7ccc46dd80 100644
--- a/harbour/contrib/libct/makefile.vc
+++ b/harbour/contrib/libct/makefile.vc
@@ -146,6 +146,7 @@ TOOLS_LIB_OBJS = \
    $(OBJ_DIR)\ftoc.obj \
    $(OBJ_DIR)\justify.obj \
    $(OBJ_DIR)\keyset.obj \
+   $(OBJ_DIR)\like.obj \
    $(OBJ_DIR)\misc1.obj \
    $(OBJ_DIR)\misc2.obj \
    $(OBJ_DIR)\misc3.obj \
@@ -221,6 +222,7 @@ CLEAN:
    -@if exist $(OBJ_DIR)\finan.* del $(OBJ_DIR)\finan.*
    -@if exist $(OBJ_DIR)\ftoc.* del $(OBJ_DIR)\ftoc.*
    -@if exist $(OBJ_DIR)\justify.* del $(OBJ_DIR)\justify.*
+   -@if exist $(OBJ_DIR)\like.* del $(OBJ_DIR)\like.*
    -@if exist $(OBJ_DIR)\misc1.* del $(OBJ_DIR)\misc1.*
    -@if exist $(OBJ_DIR)\misc2.* del $(OBJ_DIR)\misc2.*
    -@if exist $(OBJ_DIR)\misc3.* del $(OBJ_DIR)\misc3.*