diff --git a/CMakeLists.txt b/CMakeLists.txt
index 48f2d4d16..f1308ced3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,7 +9,11 @@ include(FeatureSummary)
 ################# set KDE specific information #################
 
 find_package(ECM 0.0.8 REQUIRED NO_MODULE)
-set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
+set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
+
+include(KDEInstallDirs)
+include(KDECMakeSettings)
+include(KDECompilerSettings)
 
 add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0)
 
@@ -38,9 +42,7 @@ set (QT_MIN_VERSION "5.2.0")
 
 find_package(Qt5 REQUIRED NO_MODULE COMPONENTS Quick X11Extras Sql UiTools Qml Widgets Svg Declarative Script Test)
 
-# Load CMake, Compiler and InstallDirs settings from KF5 and the following are already somewhat "done" tier1/tier2 libs from kdelibs:
-find_package(KF5 MODULE REQUIRED COMPONENTS CMake Compiler InstallDirs
-                                            KIdleTime ItemModels KWidgetsAddons KWindowSystem KCodecs KArchive KCoreAddons Solid ThreadWeaver
+find_package(KF5 MODULE REQUIRED KIdleTime ItemModels KWidgetsAddons KWindowSystem KCodecs KArchive KCoreAddons Solid ThreadWeaver
                                             KConfig KAuth KJS KWallet KDBusAddons KI18n KGuiAddons KConfigWidgets
                                             KService ItemViews KNotifications KIconThemes KCompletion KJobWidgets KConfigWidgets Sonnet KTextWidgets XmlGui KCrash KDeclarative
                                             KBookmarks KUnitConversion Kross)
diff --git a/PlasmaMacros.cmake b/PlasmaMacros.cmake
index 8adb141ee..2636a3f0f 100644
--- a/PlasmaMacros.cmake
+++ b/PlasmaMacros.cmake
@@ -1,5 +1,6 @@
 
-find_package(KF5 MODULE REQUIRED COMPONENTS InstallDirs)
+find_package(ECM 0.0.9 CONFIG REQUIRED)
+include(KDEInstallDirs)
 
 
 # plasma_install_package(path componentname [root] [type])