diff --git a/include/boost/config/platform/cygwin.hpp b/include/boost/config/platform/cygwin.hpp
index 8086c62e..0fd2ebe2 100644
--- a/include/boost/config/platform/cygwin.hpp
+++ b/include/boost/config/platform/cygwin.hpp
@@ -32,6 +32,14 @@
 #  define BOOST_HAS_FTIME
 #endif
 
+//
+// find out if we have a stdint.h, there should be a better way to do this:
+//
+#include <sys/types.h>
+#ifdef _STDINT_H
+#define BOOST_HAS_STDINT_H
+#endif
+
 // boilerplate code:
 #include <boost/config/posix_features.hpp>
  
diff --git a/include/boost/config/platform/win32.hpp b/include/boost/config/platform/win32.hpp
index 4468e3b6..a637dc37 100644
--- a/include/boost/config/platform/win32.hpp
+++ b/include/boost/config/platform/win32.hpp
@@ -19,6 +19,11 @@
 #  define BOOST_HAS_DECLSPEC
 #endif
 
+#if defined(__MINGW32__) && ((__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 2)))
+#  define BOOST_HAS_STDINT_H
+#  define __STDC_LIMIT_MACROS
+#endif
+
 //
 // Win32 will normally be using native Win32 threads,
 // but there is a pthread library avaliable as an option,