diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 386384c42c..7f102b2b12 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,15 @@
    2008-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
 */
 
+2008-10-02 20:25 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
+  * contrib/hbct/Makefile
+  * contrib/hbct/common.mak
+  * contrib/hbct/ctmisc.prg
+  + contrib/hbct/ctdummy.prg
+    * Recently added dummy CT functions moved to a separate file.
+
+  * source/vm/thread.c
+    ! Fixed warning in HB_THREADID().
 
 2008-10-02 15:54 UTC+0200 Maurilio Longo (maurilio.longo@libero.it)
   * harbour/source/vm/thread.c
diff --git a/harbour/contrib/hbct/Makefile b/harbour/contrib/hbct/Makefile
index c5572111e2..502764cfd4 100644
--- a/harbour/contrib/hbct/Makefile
+++ b/harbour/contrib/hbct/Makefile
@@ -86,6 +86,7 @@ C_SOURCES =\
 PRG_SOURCES=\
 	blank.prg \
 	ct.prg \
+	ctdummy.prg \
 	ctmisc.prg \
 	ctrand.prg \
 	cttime.prg \
diff --git a/harbour/contrib/hbct/common.mak b/harbour/contrib/hbct/common.mak
index 9dd9145a22..7d27b66699 100644
--- a/harbour/contrib/hbct/common.mak
+++ b/harbour/contrib/hbct/common.mak
@@ -94,6 +94,7 @@ LIB_OBJS = \
     \
     $(OBJ_DIR)blank$(OBJEXT) \
     $(OBJ_DIR)ct$(OBJEXT) \
+    $(OBJ_DIR)ctdummy$(OBJEXT) \
     $(OBJ_DIR)ctmisc$(OBJEXT) \
     $(OBJ_DIR)ctrand$(OBJEXT) \
     $(OBJ_DIR)cttime$(OBJEXT) \
diff --git a/harbour/contrib/hbct/ctdummy.prg b/harbour/contrib/hbct/ctdummy.prg
new file mode 100644
index 0000000000..4005cd514e
--- /dev/null
+++ b/harbour/contrib/hbct/ctdummy.prg
@@ -0,0 +1,71 @@
+/*
+ * $Id$
+ */
+
+/*
+ * Harbour Project source code:
+ * Dummy CA-Tools functions
+ *
+ * Copyright 2008 Viktor Szakats <viktor.szakats@syenar.hu>
+ * www - http://www.harbour-project.org
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this software; see the file COPYING.  If not, write to
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA (or visit the web site http://www.gnu.org/).
+ *
+ * As a special exception, the Harbour Project gives permission for
+ * additional uses of the text contained in its release of Harbour.
+ *
+ * The exception is that, if you link the Harbour libraries with other
+ * files to produce an executable, this does not by itself cause the
+ * resulting executable to be covered by the GNU General Public License.
+ * Your use of that executable is in no way restricted on account of
+ * linking the Harbour library code into it.
+ *
+ * This exception does not however invalidate any other reasons why
+ * the executable file might be covered by the GNU General Public License.
+ *
+ * This exception applies only to the code released by the Harbour
+ * Project under the name Harbour.  If you copy code from other
+ * Harbour Project or Free Software Foundation releases into a copy of
+ * Harbour, as the General Public License permits, the exception does
+ * not apply to the code that you add in this way.  To avoid misleading
+ * anyone as to the status of such modified files, you must delete
+ * this exception notice from them.
+ *
+ * If you write modifications of your own for Harbour, it is your choice
+ * whether to permit this exception to apply to your modifications.
+ * If you do not wish that, delete this exception notice.
+ *
+ */
+
+#include "common.ch"
+
+FUNCTION getkxlat( nKeyValue )
+   RETURN nKeyValue
+
+FUNCTION setkxlat( nOrgKeyValue, nNewKeyValue )
+   LOCAL lAccepted := .F.
+
+   HB_SYMBOL_UNUSED( nOrgKeyValue )
+   HB_SYMBOL_UNUSED( nNewKeyValue )
+
+   RETURN lAccepted
+
+FUNCTION dsetkbios( lNewKeyboardMode )
+   STATIC s_lKeyboardMode := .T.
+
+   HB_SYMBOL_UNUSED( lNewKeyboardMode )
+
+   RETURN s_lKeyboardMode
diff --git a/harbour/contrib/hbct/ctmisc.prg b/harbour/contrib/hbct/ctmisc.prg
index 2a6685fafd..bdd55510e0 100644
--- a/harbour/contrib/hbct/ctmisc.prg
+++ b/harbour/contrib/hbct/ctmisc.prg
@@ -110,24 +110,3 @@ FUNCTION DOSPARAM()
 
 FUNCTION EXENAME()
    RETURN HB_ARGV( 0 )
-
-/* NOTE: Dummy */
-FUNCTION getkxlat( nKeyValue )
-   RETURN nKeyValue
-
-/* NOTE: Dummy */
-FUNCTION setkxlat( nOrgKeyValue, nNewKeyValue )
-   LOCAL lAccepted := .F.
-
-   HB_SYMBOL_UNUSED( nOrgKeyValue )
-   HB_SYMBOL_UNUSED( nNewKeyValue )
-
-   RETURN lAccepted
-
-/* NOTE: Dummy */
-FUNCTION dsetkbios( lNewKeyboardMode )
-   STATIC s_lKeyboardMode := .T.
-
-   HB_SYMBOL_UNUSED( lNewKeyboardMode )
-
-   RETURN s_lKeyboardMode
diff --git a/harbour/source/vm/thread.c b/harbour/source/vm/thread.c
index 35551f3937..47557c5b58 100644
--- a/harbour/source/vm/thread.c
+++ b/harbour/source/vm/thread.c
@@ -676,10 +676,10 @@ HB_FUNC( HB_THREADID )
 #if defined( HB_MT_VM )
    PHB_THREADSTATE pThread = ( PHB_THREADSTATE ) hb_vmThreadState();
    if( pThread )
-      hb_retnl( pThread->th_id );
+      hb_retnint( ( HB_PTRDIFF ) pThread->th_id );
    else
 #endif
-      hb_retnl( 0 );
+      hb_retnint( 0 );
 }
 
 HB_FUNC( HB_THREADJOIN )