diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index f436977701..8c4a326116 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,11 @@
    2008-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
 */
 
+2008-09-16 15:57 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
+  * harbour/include/hbthread.h
+    * do not use native TLS support in BCC builds when CodeGuard
+      is enabled
+
 2008-09-16 14:49 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   * harbour/include/hbthread.h
     + added DMC to list of compilers which can use __declspec( thread )
diff --git a/harbour/include/hbthread.h b/harbour/include/hbthread.h
index fb0a45fd4b..3fede7cc18 100644
--- a/harbour/include/hbthread.h
+++ b/harbour/include/hbthread.h
@@ -301,7 +301,7 @@ extern void hb_threadMutexUnlockAll( void );
    /* enable native compiler TLS support be default for this compilers
     * which are known that it will work correctly
     */
-#  if defined( __BORLANDC__ )
+#  if defined( __BORLANDC__ ) && !defined( __CODEGUARD__ )
 #     define HB_USE_TLS
 #  elif defined( __GNUC__ ) && __GNUC__ >= 3 && \
         defined( __GLIBC__ ) && defined( __GLIBC_MINOR__ ) && \