diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 3ee3904b03..bdc38d1183 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,15 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-12-21 20:33 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
+  * harbour/src/rtl/sha2.h
+    * use '__int64' instead of 'long long' in MSC builds - older MSC versions
+      do not support 'long long'
+
+  * harbour/utils/hbmk2/hbmk2.prg
+    * use cleaner method proposed by Viktor for adding 'clib3r' to linked
+      library list in DOS OpenWatcom builds.
+
 2009-12-21 20:11 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   * harbour/utils/hbmk2/hbmk2.prg
     * added 'clib3r' to linked library list in DOS OpenWatcom builds.
diff --git a/harbour/src/rtl/sha2.h b/harbour/src/rtl/sha2.h
index 30be9e801f..cb158b382d 100644
--- a/harbour/src/rtl/sha2.h
+++ b/harbour/src/rtl/sha2.h
@@ -52,7 +52,7 @@
 #define SHA2_TYPES
 typedef unsigned char uint8;
 typedef unsigned int  uint32;
-#if defined( __BORLANDC__ )
+#if defined( __BORLANDC__ ) || defined( _MSC_VER )
 typedef unsigned __int64 uint64;
 #else
 typedef unsigned long long uint64;
diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg
index a268aa42c3..6410ddbbd2 100644
--- a/harbour/utils/hbmk2/hbmk2.prg
+++ b/harbour/utils/hbmk2/hbmk2.prg
@@ -2806,7 +2806,7 @@ FUNCTION hbmk( aArgs, /* @ */ lPause )
          ENDCASE
          IF hbmk[ _HBMK_cPLAT ] == "dos"
             /* workaround for not included automatically CLIB in pure C mode DOS builds */
-            cOpt_Link += " LIB clib3r"
+            AAdd( l_aLIBSYS, "clib3r" )
          ENDIF
          cBin_Lib := "wlib" + cCCEXT
          cOpt_Lib := "-q {FA} {OL} {LO}{SCRIPT}"