diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1b03833f..dba60964 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,6 +9,7 @@ message(STATUS "Qt5 build")
 find_package(ECM 0.0.9 NO_MODULE)
 set_package_properties(ECM PROPERTIES TYPE REQUIRED)
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH})
+find_package(KBookmarks CONFIG REQUIRED)
 find_package(KF5 MODULE REQUIRED COMPONENTS CMake Compiler InstallDirs
     KDBusAddons KCoreAddons KConfig
     KCodecs KI18n KService KWidgetsAddons
@@ -17,6 +18,7 @@ find_package(KF5 MODULE REQUIRED COMPONENTS CMake Compiler InstallDirs
     ItemViews KNotifications KJS
     KJobWidgets KIconThemes KCompletion KTextWidgets
     XmlGui Solid KWallet KIO KUnitConversion KBookmarks KDE4Attic
+    KNotifyConfig
 )
 find_package(KDELibs4 NO_MODULE) #needed for KDE4Support
 set_package_properties(KDELibs4 PROPERTIES TYPE REQUIRED)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 3c6758e1..87ff006d 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -129,10 +129,22 @@ set(konsoleprivate_SRCS ${sessionadaptors_SRCS}
                         ${CMAKE_CURRENT_BINARY_DIR}/org.kde.konsole.Window.xml
                         ${CMAKE_CURRENT_BINARY_DIR}/org.kde.konsole.Session.xml)
 set(konsole_LIBS ${KDE4_KPTY_LIBS}
-                 ${KDE4_KIO_LIBS}
-                 ${KDE4_KNOTIFYCONFIG_LIBS}
-                 ${QT_QTXML_LIBRARY}
-                 ${X11_LIBRARIES})
+                 ${X11_LIBRARIES}
+                 KF5::XmlGui
+                 Qt5::PrintSupport
+                 Qt5::Xml
+                 KF5::KNotifications
+                 KF5::KWindowSystem
+                 KF5::KTextWidgets
+                 KF5::KGuiAddons
+                 KF5::KIconThemes
+                 KF5::KBookmarks
+                 KF5::KI18n
+                 KF5::KDE4Attic
+                 KDE4__KDE4Support
+                 ${KDE4_KIO_LIBRARY}
+                 KF5::KIOWidgets
+)
 
 if(HAVE_LIBKONQ)
   set(konsole_LIBS ${konsole_LIBS} ${LIBKONQ_LIBRARY})
@@ -155,14 +167,6 @@ kde4_add_ui_files(konsoleprivate_SRCS ColorSchemeEditor.ui
 
 kde4_add_library(konsoleprivate SHARED ${konsoleprivate_SRCS})
 target_link_libraries(konsoleprivate ${konsole_LIBS}
-  KF5::XmlGui
-  Qt5::PrintSupport
-  KF5::KNotifications
-  KF5::KWindowSystem
-  KF5::KTextWidgets
-  KF5::KGuiAddons
-  KF5::KIconThemes
-  KF5::KBookmarks
 )
 target_link_libraries(konsoleprivate LINK_INTERFACE_LIBRARIES ${konsole_LIBS})
 
@@ -178,7 +182,12 @@ kde4_add_kcfg_files(konsole_KDEINIT_SRCS settings/KonsoleSettings.kcfgc)
 kde4_add_app_icon(konsole_KDEINIT_SRCS "${KDE4_ICON_INSTALL_DIR}/oxygen/*/apps/utilities-terminal.png")
 
 kde4_add_kdeinit_executable(konsole ${konsole_KDEINIT_SRCS})
-target_link_libraries(kdeinit_konsole konsoleprivate KF5::XmlGui KF5::KWindowSystem KF5::KBookmarks)
+target_link_libraries(kdeinit_konsole konsoleprivate KF5::XmlGui KF5::KWindowSystem KF5::KBookmarks
+  KF5::KI18n
+  KF5::KDE4Attic
+  KF5::KIOWidgets
+  KF5::KNotifyConfig
+)
 
 install(TARGETS kdeinit_konsole konsole konsoleprivate
        ${INSTALL_TARGETS_DEFAULT_ARGS})
@@ -189,7 +198,7 @@ set(konsolepart_PART_SRCS Part.cpp)
 
 add_library(konsolepart MODULE ${konsolepart_PART_SRCS})
 set_target_properties(konsolepart PROPERTIES DEFINE_SYMBOL KONSOLE_PART)
-target_link_libraries(konsolepart KParts XmlGui konsoleprivate)
+target_link_libraries(konsolepart KF5::KParts KF5::XmlGui konsoleprivate)
 install(TARGETS konsolepart  DESTINATION ${PLUGIN_INSTALL_DIR})
 
 ### konsoleprofile command-line tool
diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt
index 6a09e5c9..4c0c8362 100644
--- a/src/tests/CMakeLists.txt
+++ b/src/tests/CMakeLists.txt
@@ -3,7 +3,7 @@ include_directories(${KDE4_KPTY_INCLUDES}
                    ${KDE4_KPARTS_INCLUDES}
                    ${QT_QTTEST_INCLUDES})
 
-set(KONSOLE_TEST_LIBS ${QT_QTTEST_LIBRARY} konsoleprivate)
+set(KONSOLE_TEST_LIBS Qt5::Test konsoleprivate)
 
 ## If it's interactive, it shouldn't use kde4_add_unit_test,
 ##  since make test is supposed to be fully automated.