diff --git a/include/boost/config/stdlib/stlport.hpp b/include/boost/config/stdlib/stlport.hpp
index 2e674fa5..e42885cb 100644
--- a/include/boost/config/stdlib/stlport.hpp
+++ b/include/boost/config/stdlib/stlport.hpp
@@ -7,9 +7,9 @@
 
 //  STLPort standard library config:
 
-#if !defined(__SGI_STL_PORT)
+#if !defined(__SGI_STL_PORT) && !defined(_STLPORT_VERSION)
 #  include <utility>
-#  if !defined(__SGI_STL_PORT)
+#  if !defined(__SGI_STL_PORT) && !defined(_STLPORT_VERSION)
 #      error "This is not STLPort!"
 #  endif
 #endif
@@ -91,6 +91,14 @@
 #  define BOOST_HAS_STLP_USE_FACET
 #endif
 
+//
+// If STLport thinks there are no wide functions, <cwchar> etc. is not working.
+//
+#if defined(_STLP_NO_NATIVE_WIDE_FUNCTIONS)
+#  define BOOST_NO_CWCHAR
+#  define BOOST_NO_CWTYPE
+#endif
+
 
 #define BOOST_STDLIB "STLPort standard library version " BOOST_STRINGIZE(__SGI_STL_PORT)