diff --git a/lunchbox/CMakeLists.txt b/lunchbox/CMakeLists.txt
index e6050140..12740aef 100644
--- a/lunchbox/CMakeLists.txt
+++ b/lunchbox/CMakeLists.txt
@@ -104,9 +104,15 @@ set(LUNCHBOX_SOURCES
 
 set(LUNCHBOX_PUBLIC_INCLUDE_DIRECTORIES ${Boost_INCLUDE_DIRS})
 
-list(APPEND LUNCHBOX_LINK_LIBRARIES PUBLIC ${Boost_LIBRARIES} Servus
-  ${PTHREAD_LIBRARIES} PRIVATE)
+list(APPEND LUNCHBOX_LINK_LIBRARIES PUBLIC
+  ${Boost_FILESYSTEM_LIBRARIES} ${Boost_REGEX_LIBRARIES}
+  ${Boost_SERIALIZATION_LIBRARIES} ${Boost_SYSTEM_LIBRARIES} Servus)
 
+if(COMMON_LIBRARY_TYPE MATCHES "SHARED")
+  list(APPEND LUNCHBOX_LINK_LIBRARIES ${PTHREAD_LIBRARIES})
+endif()
+
+list(APPEND LUNCHBOX_LINK_LIBRARIES PRIVATE)
 if(WIN32)
   list(APPEND LUNCHBOX_LINK_LIBRARIES ws2_32 mswsock imagehlp)
 endif(WIN32)