diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index b46fccc52d..6ddc5023c8 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,10 @@
    2008-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
 */
 
+2009-01-28 13:29 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
+  * harbour/source/common/hbprintf.c
+    * redefine [u]intmax_t as [U]LONGLONG in MSVC builds.
+
 2009-01-28 04:27 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   * harbour/source/common/hbprintf.c
     * added yet another TODO marker for easier code updating to new
diff --git a/harbour/source/common/hbprintf.c b/harbour/source/common/hbprintf.c
index 0c332b0f86..381c0e2ca4 100644
--- a/harbour/source/common/hbprintf.c
+++ b/harbour/source/common/hbprintf.c
@@ -141,7 +141,9 @@ HB_EXTERN_END
 #if ( defined( __BORLANDC__ ) && __BORLANDC__ < 1410 ) || \
     ( defined( __WATCOMC__ ) && __WATCOMC__ < 1270 ) || \
     ( defined( __DJGPP__ ) && \
-      ( __DJGPP__ < 2 || ( __DJGPP__ == 2 && __DJGPP_MINOR__ <= 3 ) ) )
+      ( __DJGPP__ < 2 || ( __DJGPP__ == 2 && __DJGPP_MINOR__ <= 3 ) ) ) || \
+    ( defined( _MSC_VER ) && \
+      !( defined( __LCC__ ) || defined( __POCC__ ) || defined( __XCC__ ) ) )
    /* TODO: add other C compilers which does not support [u]intmax_t
     *       definitions (check C compiler version number).
     *       If compiler supports stdint.h then it should be added