diff --git a/include/boost/system/detail/config.hpp b/include/boost/system/detail/config.hpp
index 2a94f39..fde93cb 100644
--- a/include/boost/system/detail/config.hpp
+++ b/include/boost/system/detail/config.hpp
@@ -9,6 +9,7 @@
 // See http://www.boost.org/libs/system for documentation.
 
 #include <boost/config.hpp>
+#include <boost/config/workaround.hpp>
 
 // BOOST_SYSTEM_HAS_SYSTEM_ERROR
 
@@ -16,6 +17,11 @@
 # define BOOST_SYSTEM_HAS_SYSTEM_ERROR
 #endif
 
+#if BOOST_WORKAROUND(BOOST_GCC, < 40600)
+// g++ 4.4's <map> is not good enough
+# undef BOOST_SYSTEM_HAS_SYSTEM_ERROR
+#endif
+
 // BOOST_SYSTEM_NOEXCEPT
 // Retained for backward compatibility