diff --git a/doc/ChangeLog b/doc/ChangeLog
index 720f412a7..72d70f92b 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,11 @@
+2012-02-13  Vadim Kurland  <vadim@netcitadel.com>
+
+	* qmake.inc.in (QMAKE_CXXFLAGS_DEBUG): fix for SF bug #3468802.
+	Need to define macro __STDC_FORMAT_MACROS. This still needs to be
+	tested on all build machines.
+
+	build 3594
+	
 2012-01-02  Vadim Kurland  <vadim@netcitadel.com>
 
 	* PolicyCompiler_ipt.cpp (specialCaseAddressRangeInRE::processNext):
diff --git a/qmake.inc.in b/qmake.inc.in
index 7ba79f1e2..c3212a3b3 100644
--- a/qmake.inc.in
+++ b/qmake.inc.in
@@ -79,6 +79,9 @@ FWB_SIG = $$(FWB_SIG)
 if (isEmpty(FWB_SIG)) { FWB_SIG=26932 }
 DEFINES += FWB_SIG=$$FWB_SIG
 
+QMAKE_CXXFLAGS_DEBUG += -D__STDC_FORMAT_MACROS
+QMAKE_CXXFLAGS_RELEASE += -D__STDC_FORMAT_MACROS
+
 exists(qmake2.inc) {
   include(qmake2.inc)
 }
diff --git a/src/libfwbuilder/qmake.inc.in b/src/libfwbuilder/qmake.inc.in
index b4f15bb4d..a73207ce1 100644
--- a/src/libfwbuilder/qmake.inc.in
+++ b/src/libfwbuilder/qmake.inc.in
@@ -43,6 +43,9 @@ unix {
     doc.path = @DOCDIR@
 }
 
+QMAKE_CXXFLAGS_DEBUG += -D__STDC_FORMAT_MACROS
+QMAKE_CXXFLAGS_RELEASE += -D__STDC_FORMAT_MACROS
+
 exists(qmake2.inc) {
   include( qmake2.inc)
 }
diff --git a/src/libfwbuilder/src/fwbuilder/uint128.h b/src/libfwbuilder/src/fwbuilder/uint128.h
index 0a2e7a4c3..b00ab47e6 100644
--- a/src/libfwbuilder/src/fwbuilder/uint128.h
+++ b/src/libfwbuilder/src/fwbuilder/uint128.h
@@ -36,7 +36,7 @@
 
 #include <stdio.h>
 
-#define __STDC_FORMAT_MACROS
+// #define __STDC_FORMAT_MACROS
 #include <inttypes.h>   // for sprintf formats for "long long"
 
 // convinience macro