diff --git a/src/modules/partition/CMakeLists.txt b/src/modules/partition/CMakeLists.txt
index 6113ab685..2a96b5a51 100644
--- a/src/modules/partition/CMakeLists.txt
+++ b/src/modules/partition/CMakeLists.txt
@@ -1,18 +1,17 @@
-project( PartitionModule )
-
-if( WITH_PARTITIONMANAGER )
-
-add_subdirectory( partitionmanager/calamares )
-
-## ECM
+# ECM used for something in the tests  directory
 find_package(ECM 0.0.13 REQUIRED NO_MODULE)
 set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${CMAKE_MODULE_PATH})
-include(KDEInstallDirs)
-include(GenerateExportHeader)
 
+# KF5::CoreAddons seems to be used for *something* in this module, not sure what
+include(KDEInstallDirs)       # this seems to be necessary for KF5::CoreAddons
+include(GenerateExportHeader) # this too, because KDE frameworks always want omnomnom more stuff
 find_package( KF5 REQUIRED CoreAddons )
 
-add_definitions( -DCALAMARES )
+# These are needed because KPMcore links publicly against ConfigCore, I18n, IconThemes, KIOCore and Service
+find_package( KF5 REQUIRED Config I18n IconThemes KIO Service )
+
+# TODO: we should require a minimum version, when KPMcore gets meaningful versioning
+find_package( KPMcore REQUIRED )
 
 add_subdirectory( tests )
 
@@ -60,10 +59,8 @@ calamares_add_plugin( partition
         gui/PartitionPage.ui
         gui/ReplacePage.ui
     LINK_LIBRARIES
-        calapm
+        kpmcore
         calamaresui
         KF5::CoreAddons
     SHARED_LIB
 )
-
-endif( WITH_PARTITIONMANAGER )