diff --git a/CMakeLists.txt b/CMakeLists.txt
index 766bcbe7f12cb6592de399aa0b58ed3ae679e06d..0064d1117f6e198a94ffeb7e2a775847987b739e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,7 +6,7 @@ set(PROJECT_VERSION "5.19.80")
 set(PROJECT_VERSION_MAJOR 5)
 
 set(QT_MIN_VERSION "5.12.0")
-set(KF5_MIN_VERSION "5.71.0")
+set(KF5_MIN_VERSION "5.72.0")
 
 find_package(ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE)
 set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules)
diff --git a/runners/kwin/CMakeLists.txt b/runners/kwin/CMakeLists.txt
index fd681ce278aa17efd318a6861b1e933027fa82cf..b4cd18dea2883f3b2235597d1d65fe5ad263c59c 100644
--- a/runners/kwin/CMakeLists.txt
+++ b/runners/kwin/CMakeLists.txt
@@ -5,11 +5,11 @@ set(krunner_kwin_SRCS
 )
 
 add_library(krunner_kwin MODULE ${krunner_kwin_SRCS})
+kcoreaddons_desktop_to_json(krunner_kwin plasma-runner-kwin.desktop)
 target_link_libraries(krunner_kwin
                         Qt5::DBus
                         KF5::KIOCore
                         KF5::I18n
                         KF5::Runner)
 
-install(TARGETS krunner_kwin DESTINATION ${KDE_INSTALL_PLUGINDIR})
-install(FILES plasma-runner-kwin.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR})
+install(TARGETS krunner_kwin DESTINATION "${KDE_INSTALL_PLUGINDIR}/kf5/krunner")
diff --git a/runners/kwin/kwin-runner.cpp b/runners/kwin/kwin-runner.cpp
index b468873636a8983f172ee2c76034bb7ccf204181..b3b36f0c85252b5f7da679cde78921a1b0131bfb 100644
--- a/runners/kwin/kwin-runner.cpp
+++ b/runners/kwin/kwin-runner.cpp
@@ -25,7 +25,7 @@
 
 #include <KLocalizedString>
 
-K_EXPORT_PLASMA_RUNNER(kwin, KWinRunner)
+K_EXPORT_PLASMA_RUNNER_WITH_JSON(KWinRunner, "plasma-runner-kwin.json")
 
 static const QString s_kwinService = QStringLiteral("org.kde.KWin");
 static const QString s_keyword = QStringLiteral("KWin");
diff --git a/runners/kwin/plasma-runner-kwin.desktop b/runners/kwin/plasma-runner-kwin.desktop
index bd79d1fd344b4694074fd2d17f1c40de2d90ccc3..1ee7c2425c9a6bf02e7dc792da849373c19c1e67 100644
--- a/runners/kwin/plasma-runner-kwin.desktop
+++ b/runners/kwin/plasma-runner-kwin.desktop
@@ -84,7 +84,6 @@ Comment[zh_TW]=與 Plasma 合成器互動
 X-KDE-ServiceTypes=Plasma/Runner
 Type=Service
 Icon=kwin
-X-KDE-Library=krunner_kwin
 X-Plasma-RunnerPhase=first
 X-KDE-PluginInfo-Author=Plasma Team
 X-KDE-PluginInfo-Email=plasma-devel@kde.org
diff --git a/runners/plasma-desktop/CMakeLists.txt b/runners/plasma-desktop/CMakeLists.txt
index a21950a443019ac6a0bf3b47eb70a04a46789bc1..e44ae7eb2840d4b1c4b022dfad1ddf46c85bef0b 100644
--- a/runners/plasma-desktop/CMakeLists.txt
+++ b/runners/plasma-desktop/CMakeLists.txt
@@ -5,11 +5,11 @@ set(krunner_plasma-desktop_SRCS
 )
 
 add_library(krunner_plasma-desktop MODULE ${krunner_plasma-desktop_SRCS})
+kcoreaddons_desktop_to_json(krunner_plasma-desktop plasma-runner-plasma-desktop.desktop)
 target_link_libraries(krunner_plasma-desktop
                         Qt5::DBus
                         KF5::KIOCore
                         KF5::I18n
                         KF5::Runner)
 
-install(TARGETS krunner_plasma-desktop DESTINATION ${KDE_INSTALL_PLUGINDIR})
-install(FILES plasma-runner-plasma-desktop.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR})
+install(TARGETS krunner_plasma-desktop DESTINATION "${KDE_INSTALL_PLUGINDIR}/kf5/krunner")
diff --git a/runners/plasma-desktop/plasma-desktop-runner.cpp b/runners/plasma-desktop/plasma-desktop-runner.cpp
index fd2403d9a053159f4d25cc7d0964f634a36fc88c..9211482212a48fb7b82e8137f1bacb6e45615696 100644
--- a/runners/plasma-desktop/plasma-desktop-runner.cpp
+++ b/runners/plasma-desktop/plasma-desktop-runner.cpp
@@ -26,7 +26,7 @@
 
 #include <KLocalizedString>
 
-K_EXPORT_PLASMA_RUNNER(plasma-desktop, PlasmaDesktopRunner)
+K_EXPORT_PLASMA_RUNNER_WITH_JSON(PlasmaDesktopRunner, "plasma-runner-plasma-desktop.json")
 
 static const QString s_plasmaService = QLatin1String("org.kde.plasmashell");
 
diff --git a/runners/plasma-desktop/plasma-runner-plasma-desktop.desktop b/runners/plasma-desktop/plasma-runner-plasma-desktop.desktop
index acd5f54017aeaf6979fc95a4c7ed22a45858a15e..65fbdb3cecdd2c310251fc16eafa60a9b9ef7731 100644
--- a/runners/plasma-desktop/plasma-runner-plasma-desktop.desktop
+++ b/runners/plasma-desktop/plasma-runner-plasma-desktop.desktop
@@ -128,7 +128,6 @@ Comment[zh_TW]=與 Plasma 桌面 shell 互動
 X-KDE-ServiceTypes=Plasma/Runner
 Type=Service
 Icon=plasma
-X-KDE-Library=krunner_plasma-desktop
 X-Plasma-RunnerPhase=first
 X-KDE-PluginInfo-Author=Plasma Team
 X-KDE-PluginInfo-Email=plasma-devel@kde.org