diff --git a/include/boost/config/auto_link.hpp b/include/boost/config/auto_link.hpp
index 8afb177e..eade040d 100644
--- a/include/boost/config/auto_link.hpp
+++ b/include/boost/config/auto_link.hpp
@@ -83,6 +83,7 @@ BOOST_LIB_VERSION:    The Boost version, in the form x_y, for Boost version x.y.
 //
 #if (defined(BOOST_MSVC) && defined(_MSC_EXTENSIONS)) \
     || defined(__BORLANDC__) \
+    || (defined(__MWERKS__) && defined(_WIN32) && (__MWERKS__ >= 0x3000)) \
     || (defined(__ICL) && defined(_MSC_EXTENSIONS) && (_MSC_VER >= 1200))
 
 #ifndef BOOST_VERSION_HPP
@@ -129,6 +130,16 @@ BOOST_LIB_VERSION:    The Boost version, in the form x_y, for Boost version x.y.
    // Intel C++, no version number:
 #  define BOOST_LIB_TOOLSET "iw"
 
+#elif defined(__MWERKS__) && (__MWERKS__ <= 0x31FF )
+
+   // Metrowerks CodeWarrior 8.x
+#  define BOOST_LIB_TOOLSET "cw8"
+
+#elif defined(__MWERKS__) && (__MWERKS__ <= 0x32FF )
+
+   // Metrowerks CodeWarrior 9.x
+#  define BOOST_LIB_TOOLSET "cw9"
+
 #endif
 
 //
@@ -140,7 +151,7 @@ BOOST_LIB_VERSION:    The Boost version, in the form x_y, for Boost version x.y.
 #  define BOOST_LIB_THREAD_OPT
 #endif
 
-#ifdef _MSC_VER
+#if defined(_MSC_VER) || defined(__MWERKS__)
 
 #  ifdef _DLL