diff --git a/CMakeLists.txt b/CMakeLists.txt
index e0343cd3432fdc92be407977e3d0672031cbbf73..4ccdc1fd576142e6c96a22876b1adb9d60010863 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -41,13 +41,7 @@ endif(CMAKE_COMPILER_IS_GNUCXX)
 set(LIBS "")
 include_directories(${Corpus2Library_SOURCE_DIR})
 
-if(WIN32)
-# Need to work out how to properly link to boost DLLs on Windows
-# For now, just link to static boost libs to make it work
-	set(Boost_USE_STATIC_LIBS        ON)
-	set(Boost_USE_MULTITHREADED      ON)
-	set(Boost_USE_STATIC_RUNTIME    OFF)
-endif(WIN32)
+set(Boost_USE_STATIC_LIBS        OFF)
 find_package(Boost 1.41 REQUIRED COMPONENTS program_options filesystem regex)
 
 set(LIBCORPUS2_INSTALL_DATA_DIR share/corpus2)