diff --git a/config.htm b/config.htm
index 518c349e..e426bea8 100644
--- a/config.htm
+++ b/config.htm
@@ -589,7 +589,10 @@ f(&amp;bar); // should choose #2.</pre>
         <td valign="top" width="51%">BOOST_NO_LIMITS</td>
         <td valign="top" width="16%">Standard library</td>
         <td valign="top" width="33%">The C++ implementation does
-        not provide the &lt;limits&gt; header.</td>
+        not provide the &lt;limits&gt; header.  Never check for this
+        symbol in library code; always include
+        &lt;boost/limits.hpp&gt;, which guarantees to provide
+        <code>std::numeric_limits</code>.</td>
     </tr>
     <tr>
         <td valign="top" width="51%">BOOST_NO_LIMITS_COMPILE_TIME_CONSTANTS</td>
diff --git a/include/boost/config/stdlib/sgi.hpp b/include/boost/config/stdlib/sgi.hpp
index 45a24cb4..dd086c2c 100644
--- a/include/boost/config/stdlib/sgi.hpp
+++ b/include/boost/config/stdlib/sgi.hpp
@@ -82,6 +82,8 @@
 #  include <string>
 #  if defined(__BASTRING__)
 #     define BOOST_NO_LIMITS
+// Note: <boost/limits.hpp> will provide compile-time constants
+#     undef BOOST_NO_LIMITS_COMPILE_TIME_CONSTANTS
 #     define BOOST_NO_STD_WSTRING
 #  endif
 #endif