diff --git a/CMakeLists.txt b/CMakeLists.txt
index 62817ba0617c5fb50277cf7535368274ed9bd2dd..089d20a50aa4215d8d9d62b986fab3b80b70158c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -46,7 +46,16 @@ include_directories(${WCCL_SOURCE_DIR})
 
 set(LIBWCCL_VERSION "${ver_major}.${ver_minor}.${ver_patch}")
 
-find_package(Boost 1.41 REQUIRED COMPONENTS program_options filesystem regex)
+find_package(Boost 1.41 REQUIRED COMPONENTS program_options system filesystem regex)
+
+if(MSVC OR BORLAND)
+# Use the auto-linking feature, don't try to add libraries yourself:
+	set(Boost_LIBRARIES "")
+# Note the default is to link static libs and it is left like that here.
+# You can make it link to DLL by defining BOOST_#module#_DYN_LINK
+# in C++ source file or somewhere in CMake file, e.g. 
+# add_definitions( -DBOOST_FILESYSTEM_DYN_LINK )
+endif(MSVC OR BORLAND)
 
 add_subdirectory(libwccl)
 add_subdirectory(wcclparser)