diff --git a/CMakeLists.txt b/CMakeLists.txt
index 07aaf651..a69a1d3c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -15,6 +15,15 @@ message(STATUS "|- log4cxx : -DLOG4CXX_INCLUDE_DIR,  -DLOG4CXX_LIBRARY")
 message(STATUS "|- purple  : -DPURPLE_INCLUDE_DIR,   -DPURPLE_LIBRARY")
 message(STATUS "           : -DPURPLE_NOT_RUNTIME - enables compilation with libpurple.lib")
 
+MACRO(LIST_CONTAINS var value)
+	SET(${var})
+	FOREACH (value2 ${ARGN})
+		IF (${value} STREQUAL ${value2})
+		SET(${var} TRUE)
+		ENDIF (${value} STREQUAL ${value2})
+	ENDFOREACH (value2)
+ENDMACRO(LIST_CONTAINS)
+
 if(NOT LIB_INSTALL_DIR)
 	set(LIB_INSTALL_DIR "lib")
 endif()
@@ -131,7 +140,12 @@ if (WIN32)
 	set(Boost_USE_STATIC_RUNTIME    OFF)
 	find_package(Boost COMPONENTS program_options date_time system filesystem regex thread signals REQUIRED)
 else(WIN32)
-	find_package(Boost COMPONENTS program_options date_time system filesystem regex thread signals REQUIRED)
+	LIST_CONTAINS(contains -lboost_program_options ${SWIFTEN_LIBRARY})
+	if(contains)
+		message(STATUS "Using non-multithreaded boost")
+		set(Boost_USE_MULTITHREADED 0)
+	endif(contains)
+	find_package(Boost COMPONENTS program_options date_time system filesystem regex thread-mt signals REQUIRED)
 endif(WIN32)
 
 message( STATUS "Found Boost: ${Boost_LIBRARIES}, ${Boost_INCLUDE_DIR}")