diff --git a/BaseLib/CMakeLists.txt b/BaseLib/CMakeLists.txt
index de39113bba5e9f8de1a1b8811daae1fca2a50950..4b82f184cfdda920477c0ef9a5741609427d383f 100644
--- a/BaseLib/CMakeLists.txt
+++ b/BaseLib/CMakeLists.txt
@@ -12,6 +12,6 @@ INCLUDE_DIRECTORIES(
 )
 
 TARGET_LINK_LIBRARIES( BaseLib
-	boost_system
-	boost_filesystem 
+	${Boost_FILESYSTEM_LIBRARY}
+	${Boost_SYSTEM_LIBRARY}
 )
diff --git a/SimpleTests/MeshTests/CMakeLists.txt b/SimpleTests/MeshTests/CMakeLists.txt
index 3acfbd1fdc40486f8e706c8f5f69c8b68f84bc1a..017a2dd9389009a5f67204f9dc2877607afb0ead 100644
--- a/SimpleTests/MeshTests/CMakeLists.txt
+++ b/SimpleTests/MeshTests/CMakeLists.txt
@@ -27,8 +27,8 @@ TARGET_LINK_LIBRARIES ( MeshRead
 	logog
 	zlib
 	${ADDITIONAL_LIBS}
-	boost_system
-	boost_filesystem
+	${Boost_FILESYSTEM_LIBRARY}
+	${Boost_SYSTEM_LIBRARY}
 )
 
 # Create CollapseMeshNodes executable
@@ -45,8 +45,8 @@ TARGET_LINK_LIBRARIES ( CollapseMeshNodes
 	BaseLib
 	GeoLib
 	logog
-	boost_system
-	boost_filesystem
+	${Boost_FILESYSTEM_LIBRARY}
+	${Boost_SYSTEM_LIBRARY}
 )
 
 # Create MeshSearchTest executable
@@ -64,6 +64,6 @@ TARGET_LINK_LIBRARIES ( MeshSearchTest
 	GeoLib
 	logog
 	${ADDITIONAL_LIBS}
-	boost_system
-	boost_filesystem
+	${Boost_FILESYSTEM_LIBRARY}
+	${Boost_SYSTEM_LIBRARY}
 )
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index cc6f5558b34476954d6d319c9c00fa2cefee4233..7f63037318f5f6cbb588419890ccceb43777afaf 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -41,8 +41,8 @@ TARGET_LINK_LIBRARIES(testrunner
 	MeshLib
 	OgsLib
 	logog
-	boost_system
-	boost_filesystem
+	${Boost_FILESYSTEM_LIBRARY}
+	${Boost_SYSTEM_LIBRARY}
 	${CMAKE_THREAD_LIBS_INIT}
 )