diff --git a/cmake/WtFindBoost.txt b/cmake/WtFindBoost.txt
index 973d0f4..55b2a7f 100644
--- a/cmake/WtFindBoost.txt
+++ b/cmake/WtFindBoost.txt
@@ -20,6 +20,13 @@
 # when the libraries are all of the same kind (mt or not). If the mt
 # libraries exits, the mt versions will be used unless MULTI_THREADED is
 # set to OFF. Otherwise, the non-mt versions will be used.
+IF(BOOST_FORCE_MULTITHREAD)
+    SET (BOOST_MT_EXTENSION "")
+    MESSAGE("Forcing use of Multithreading")
+ELSE(BOOST_FORCE_MULTITHREAD)
+    SET (BOOST_MT_EXTENSION -mt)
+ENDIF(BOOST_FORCE_MULTITHREAD)
+
 
 FIND_PATH(BOOST_INCLUDE_DIRS
     boost/lexical_cast.hpp
@@ -40,10 +47,10 @@ IF(WIN32)
 ELSE(WIN32)
   FIND_LIBRARY(BOOST_REGEX_LIB_MT
     NAMES
-      boost_regex-${BOOST_COMPILER}-mt-${BOOST_VERSION}
-      boost_regex-${BOOST_COMPILER}-mt
-      boost_regex-mt-${BOOST_VERSION}
-      boost_regex-mt
+      boost_regex-${BOOST_COMPILER}${BOOST_MT_EXTENSION}-${BOOST_VERSION}
+      boost_regex-${BOOST_COMPILER}${BOOST_MT_EXTENSION}
+      boost_regex${BOOST_MT_EXTENSION}-${BOOST_VERSION}
+      boost_regex${BOOST_MT_EXTENSION}
     PATHS
       ${BOOST_LIB_DIRS}
     NO_DEFAULT_PATH
@@ -61,10 +68,10 @@ ELSE(WIN32)
 
   FIND_LIBRARY(BOOST_PO_LIB_MT
     NAMES
-      boost_program_options-${BOOST_COMPILER}-mt-${BOOST_VERSION}
-      boost_program_options-${BOOST_COMPILER}-mt
-      boost_program_options-mt-${BOOST_VERSION}
-      boost_program_options-mt
+      boost_program_options-${BOOST_COMPILER}${BOOST_MT_EXTENSION}-${BOOST_VERSION}
+      boost_program_options-${BOOST_COMPILER}${BOOST_MT_EXTENSION}
+      boost_program_options${BOOST_MT_EXTENSION}-${BOOST_VERSION}
+      boost_program_options${BOOST_MT_EXTENSION}
     PATHS
       ${BOOST_LIB_DIRS}
     NO_DEFAULT_PATH
@@ -82,10 +89,10 @@ ELSE(WIN32)
 
   FIND_LIBRARY(BOOST_DT_LIB_MT
     NAMES
-      boost_date_time-${BOOST_COMPILER}-mt-${BOOST_VERSION}
-      boost_date_time-${BOOST_COMPILER}-mt
-      boost_date_time-mt-${BOOST_VERSION}
-      boost_date_time-mt
+      boost_date_time-${BOOST_COMPILER}${BOOST_MT_EXTENSION}-${BOOST_VERSION}
+      boost_date_time-${BOOST_COMPILER}${BOOST_MT_EXTENSION}
+      boost_date_time${BOOST_MT_EXTENSION}-${BOOST_VERSION}
+      boost_date_time${BOOST_MT_EXTENSION}
     PATHS
       ${BOOST_LIB_DIRS}
     NO_DEFAULT_PATH
@@ -103,10 +110,10 @@ ELSE(WIN32)
 
   FIND_LIBRARY(BOOST_SIGNALS_LIB_MT
     NAMES
-      boost_signals-${BOOST_COMPILER}-mt-${BOOST_VERSION}
-      boost_signals-${BOOST_COMPILER}-mt
-      boost_signals-mt-${BOOST_VERSION}
-      boost_signals-mt
+      boost_signals-${BOOST_COMPILER}${BOOST_MT_EXTENSION}-${BOOST_VERSION}
+      boost_signals-${BOOST_COMPILER}${BOOST_MT_EXTENSION}
+      boost_signals${BOOST_MT_EXTENSION}-${BOOST_VERSION}
+      boost_signals${BOOST_MT_EXTENSION}
     PATHS
       ${BOOST_LIB_DIRS}
     NO_DEFAULT_PATH
@@ -124,10 +131,10 @@ ELSE(WIN32)
 
   FIND_LIBRARY(BOOST_THREAD_LIB_MT
     NAMES
-      boost_thread-${BOOST_COMPILER}-mt-${BOOST_VERSION}
-      boost_thread-${BOOST_COMPILER}-mt
-      boost_thread-mt-${BOOST_VERSION}
-      boost_thread-mt
+      boost_thread-${BOOST_COMPILER}${BOOST_MT_EXTENSION}-${BOOST_VERSION}
+      boost_thread-${BOOST_COMPILER}${BOOST_MT_EXTENSION}
+      boost_thread${BOOST_MT_EXTENSION}-${BOOST_VERSION}
+      boost_thread${BOOST_MT_EXTENSION}
     PATHS
       ${BOOST_LIB_DIRS}
     NO_DEFAULT_PATH
@@ -135,10 +142,10 @@ ELSE(WIN32)
 
   FIND_LIBRARY(BOOST_SYSTEM_LIB_MT
     NAMES
-      boost_system-${BOOST_COMPILER}-mt-${BOOST_VERSION}
-      boost_system-${BOOST_COMPILER}-mt
-      boost_system-mt-${BOOST_VERSION}
-      boost_system-mt
+      boost_system-${BOOST_COMPILER}${BOOST_MT_EXTENSION}-${BOOST_VERSION}
+      boost_system-${BOOST_COMPILER}${BOOST_MT_EXTENSION}
+      boost_system${BOOST_MT_EXTENSION}-${BOOST_VERSION}
+      boost_system${BOOST_MT_EXTENSION}
     PATHS
       ${BOOST_LIB_DIRS}
     NO_DEFAULT_PATH
@@ -156,10 +163,10 @@ ELSE(WIN32)
 
   FIND_LIBRARY(BOOST_FS_LIB_MT
     NAMES
-      boost_filesystem-${BOOST_COMPILER}-mt-${BOOST_VERSION}
-      boost_filesystem-${BOOST_COMPILER}-mt
-      boost_filesystem-mt-${BOOST_VERSION}
-      boost_filesystem-mt
+      boost_filesystem-${BOOST_COMPILER}${BOOST_MT_EXTENSION}-${BOOST_VERSION}
+      boost_filesystem-${BOOST_COMPILER}${BOOST_MT_EXTENSION}
+      boost_filesystem${BOOST_MT_EXTENSION}-${BOOST_VERSION}
+      boost_filesystem${BOOST_MT_EXTENSION}
     PATHS
       ${BOOST_LIB_DIRS}
     NO_DEFAULT_PATH