diff --git a/include/boost/detail/limits.hpp b/include/boost/detail/limits.hpp
index 81033c5c..494ce0f5 100644
--- a/include/boost/detail/limits.hpp
+++ b/include/boost/detail/limits.hpp
@@ -92,8 +92,16 @@ enum float_denorm_style {
   static const __mem_type __mem_name = __mem_value
 #endif /* BOOST_NO_INCLASS_MEMBER_INITIALIZATION */
 
-// Base class for all specializations of numeric_limits.
+// Deal with min/max for MinGW
+#ifdef min
+# undef min
+#endif
 
+#ifdef max
+# undef max
+#endif
+
+// Base class for all specializations of numeric_limits.
 template <class __number>
 class _Numeric_limits_base {
 public: