diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index edeb3cec7b..c935d1dfe1 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,13 @@
    2008-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
 */
 
+2008-11-03 00:56 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
+  * harbour/source/vm/thread.c
+    + added temporary workaround for non GCC OS2 ST builds
+
+  * harbour/source/rtl/hbmd5.c
+    * casting cleanup
+
 2008-11-02 23:10 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
   * include/hbapicdp.h
   * common.mak
diff --git a/harbour/source/rtl/hbmd5.c b/harbour/source/rtl/hbmd5.c
index 7b5a931c3f..fb3e6fd826 100644
--- a/harbour/source/rtl/hbmd5.c
+++ b/harbour/source/rtl/hbmd5.c
@@ -325,7 +325,7 @@ HB_EXPORT void hb_md5file( HB_FHANDLE hFile, BYTE * ucDigest )
    UCHAR buf[ 128 ], * readbuf = ( UCHAR * ) hb_xgrab( MAX_FBUF );
 
    hb_md5accinit( md5.accum );
-   n = hb_fsReadLarge( hFile, readbuf, MAX_FBUF );
+   n = hb_fsReadLarge( hFile, ( BYTE * ) readbuf, MAX_FBUF );
    flen += n;
    while( n == MAX_FBUF )
    {
@@ -334,7 +334,7 @@ HB_EXPORT void hb_md5file( HB_FHANDLE hFile, BYTE * ucDigest )
          memcpy( md5.buf, readbuf + ( i << 6 ), 64 );
          hb_md5go( &md5 );
       }
-      n = hb_fsReadLarge( hFile, readbuf, MAX_FBUF );
+      n = hb_fsReadLarge( hFile, ( BYTE * ) readbuf, MAX_FBUF );
       flen += n;
    }
    hb_fsClose( hFile );
diff --git a/harbour/source/vm/thread.c b/harbour/source/vm/thread.c
index 387b5f7873..c9f87b9991 100644
--- a/harbour/source/vm/thread.c
+++ b/harbour/source/vm/thread.c
@@ -74,6 +74,12 @@
 #  include <sys/time.h>
 #endif
 
+/* temporary workaround for non GCC ST builds */
+#if !defined( HB_MT_VM ) && defined( HB_OS_OS2 ) && !defined( __GNUC__ )
+#  define _gettid()     0
+#endif
+
+
 static volatile BOOL s_fThreadInit = FALSE;
 static PHB_ITEM s_pOnceMutex = NULL;