diff --git a/include/boost/config.hpp b/include/boost/config.hpp
index 9a1d51c9..c268a948 100644
--- a/include/boost/config.hpp
+++ b/include/boost/config.hpp
@@ -417,13 +417,16 @@
 
 //  end of compiler specific portion  ----------------------------------------//
 
-#if defined(BOOST_NO_LIMITS) || defined(_RWSTD_VER) || (defined(__SGI_STL_PORT) && __SGI_STL_PORT <= 0x410 && __STL_STATIC_CONST_INIT_BUG)
+#if defined(BOOST_NO_LIMITS) || \
+  (defined(_RWSTD_VER) && _RWSTD_VER < 0x0203) || \
+  (defined(__SGI_STL_PORT) && __SGI_STL_PORT <= 0x410 && __STL_STATIC_CONST_INIT_BUG)
 // STLPort 4.0 doesn't define the static constants in numeric_limits<> so that they
 // can be used at compile time if the compiler bug indicated by
 // __STL_STATIC_CONST_INIT_BUG is present.
 
 // Rogue wave STL (C++ Builder) also has broken numeric_limits
 // with default template defining members out of line.
+// However, Compaq C++ also uses RogueWave (version 2.03) and it's ok.
 #   define BOOST_NO_LIMITS_COMPILE_TIME_CONSTANTS
 #endif
 
@@ -476,6 +479,3 @@ namespace std {
 
 #endif  // BOOST_CONFIG_HPP
 
-
-
-