diff --git a/CMakeLists.txt b/CMakeLists.txt
index a56f2fa0..87593d35 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -18,6 +18,7 @@ find_package(Wt REQUIRED COMPONENTS Wt Dbo DboSqlite3 HTTP)
 find_package(PAM)
 find_package(STB)
 pkg_check_modules(GRAPHICSMAGICKXX GraphicsMagick++)
+pkg_check_modules(CONFIG++ REQUIRED IMPORTED_TARGET libconfig++)
 
 # WT
 if (NOT Wt_FOUND)
diff --git a/src/libs/cover/CMakeLists.txt b/src/libs/cover/CMakeLists.txt
index 3365d4a0..8913b5b9 100644
--- a/src/libs/cover/CMakeLists.txt
+++ b/src/libs/cover/CMakeLists.txt
@@ -36,7 +36,7 @@ elseif (IMAGE_LIBRARY STREQUAL GraphicsMagick++)
 	target_compile_options(lmscover PRIVATE "-DLMS_SUPPORT_IMAGE_GM")
 	target_include_directories(lmscover PRIVATE ${GRAPHICSMAGICKXX_INCLUDE_DIRS})
 	target_compile_options(lmscover PRIVATE ${GRAPHICSMAGICKXX_CFLAGS_OTHER})
-	target_link_libraries(lmscover PRIVATE ${GRAPHICSMAGICKXX_LIBRARIES})
+	target_link_libraries(lmscover PRIVATE ${GRAPHICSMAGICKXX_LINK_LIBRARIES})
 else ()
 	message(FATAL_ERROR "Invalid IMAGE_LIBRARY provided")
 endif()
diff --git a/src/libs/metadata/CMakeLists.txt b/src/libs/metadata/CMakeLists.txt
index 0fc6da2d..201bfeb4 100644
--- a/src/libs/metadata/CMakeLists.txt
+++ b/src/libs/metadata/CMakeLists.txt
@@ -14,7 +14,7 @@ target_include_directories(lmsmetadata PRIVATE
 
 target_link_libraries(lmsmetadata PRIVATE
 	lmsav
-	tag
+	${Taglib_LIBRARIES}
 	)
 
 target_link_libraries(lmsmetadata PUBLIC
diff --git a/src/libs/utils/CMakeLists.txt b/src/libs/utils/CMakeLists.txt
index 75e11b19..b9474d47 100644
--- a/src/libs/utils/CMakeLists.txt
+++ b/src/libs/utils/CMakeLists.txt
@@ -22,7 +22,7 @@ target_include_directories(lmsutils PRIVATE
 	)
 
 target_link_libraries(lmsutils PRIVATE
-	config++
+	PkgConfig::CONFIG++
 	)
 
 target_link_libraries(lmsutils PUBLIC