diff --git a/sm5/CHANGELOG b/sm5/CHANGELOG
index 23cd5b8a85bcb0c865c63a3c9f4548f85e1c3735..08d7b36f0e5611b661a67d614c3c2ece6f0da8d9 100644
--- a/sm5/CHANGELOG
+++ b/sm5/CHANGELOG
@@ -1,6 +1,6 @@
 CHANGELOG for smartmontools
 
-$Id: CHANGELOG,v 1.581 2006/10/25 22:18:43 pjwilliams Exp $
+$Id: CHANGELOG,v 1.582 2006/10/27 20:24:27 chrfranke Exp $
 
 The most recent version of this file is:
 http://smartmontools.cvs.sourceforge.net/smartmontools/sm5/CHANGELOG?view=markup
@@ -33,6 +33,8 @@ NOTES FOR FUTURE RELEASES: see TODO file.
 
 <DEVELOPERS: ADDITIONS TO THE CHANGE LOG GO JUST BELOW HERE, PLEASE>
 
+  [CF] Windows: Fixed int64 printf format for MinGW runtime.
+
   [PW] Drive database: added Seagate Barracuda 7200.10 family, Seagate
        Momentus 42 family, Maxtor DiamondMax 60 ATA 66 family, Maxtor
        DiamondMax 60 ATA 100 family, and Western Digital Caviar Serial
diff --git a/sm5/int64.h b/sm5/int64.h
index 00ca3b57e7cf970b0537e94881108f3a5bd57758..dc44a9ee1368a70c5d52ba715c25b036a755ac07 100644
--- a/sm5/int64.h
+++ b/sm5/int64.h
@@ -20,7 +20,7 @@
 #ifndef INT64_H_
 #define INT64_H_
 
-#define INT64_H_CVSID "$Id: int64.h,v 1.14 2006/10/22 11:50:47 ballen4705 Exp $\n"
+#define INT64_H_CVSID "$Id: int64.h,v 1.15 2006/10/27 20:24:27 chrfranke Exp $\n"
 
 // 64 bit integer typedefs
 
@@ -58,8 +58,8 @@ typedef unsigned long long uint64_t;
 
 // 64 bit integer format strings
 
-#if defined(_WIN32) && defined(_MSC_VER)
-// for MSVC 6.0
+#if defined(_WIN32)
+// for MSVCRT.DLL (used by both MSVC 6.0 and MinGW)
 #define PRId64 "I64d"
 #define PRIu64 "I64u"
 #define PRIx64 "I64x"
@@ -77,7 +77,7 @@ typedef unsigned long long uint64_t;
 
 // If macros not defined in inttypes.h, fix here.  Default is GCC
 // style
-#ifndef PRId64		
+#ifndef PRId64
 #define PRId64 "lld"
 #endif // ndef PRId64