diff --git a/depends/packages/boost.mk b/depends/packages/boost.mk
--- a/depends/packages/boost.mk
+++ b/depends/packages/boost.mk
@@ -19,7 +19,7 @@
 $(package)_archiver_$(host_os)=$($(package)_ar)
 $(package)_toolset_darwin=darwin
 $(package)_archiver_darwin=$($(package)_libtool)
-$(package)_config_libraries=chrono,filesystem,program_options,system,thread,test
+$(package)_config_libraries=atomic,date_time,chrono,filesystem,program_options,system,thread,test
 $(package)_cxxflags=-std=c++11 -fvisibility=hidden
 $(package)_cxxflags_linux=-fPIC
 endef
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -90,12 +90,10 @@
 		${OPENSSL_INCLUDE_DIR}
 )
 
-# Dependencies
-set(BOOST_PACKAGES_REQUIRED chrono filesystem program_options)
-
+# Target specific configs
 if(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
 	set(Boost_USE_STATIC_LIBS ON)
-	list(APPEND BOOST_PACKAGES_REQUIRED thread_win32)
+	set(Boost_THREADAPI win32)
 
 	find_package(SHLWAPI REQUIRED)
 	target_link_libraries(util ${SHLWAPI_LIBRARY})
@@ -103,10 +101,13 @@
 
 	find_library(WS2_32_LIBRARY NAMES ws2_32)
 	target_link_libraries(util ${WS2_32_LIBRARY})
-else()
-	list(APPEND BOOST_PACKAGES_REQUIRED date_time thread)
+	
+	target_compile_definitions(util PUBLIC BOOST_THREAD_USE_LIB)
 endif()
 
+# Boost packages
+set(BOOST_PACKAGES_REQUIRED chrono filesystem program_options thread)
+
 function(prepend var prefix)
 	set(listVar "")
 	foreach(f ${ARGN})