diff --git a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -53,8 +53,9 @@
      status-message-parser.cpp
 )
 
-add_library (kded_ktp_integration_module MODULE ${kded_ktp_integration_module_SRCS}
-)
+add_library (kded_ktp_integration_module MODULE ${kded_ktp_integration_module_SRCS})
+set_target_properties (kded_ktp_integration_module PROPERTIES OUTPUT_NAME ktp_integration)
+kcoreaddons_desktop_to_json(kded_ktp_integration_module ktp_integration_module.desktop)
 
 target_link_libraries (kded_ktp_integration_module
                        KTp::CommonInternals
@@ -75,11 +76,7 @@
 )
 
 install (TARGETS kded_ktp_integration_module
-         DESTINATION ${PLUGIN_INSTALL_DIR}
-)
-
-install (FILES ktp_integration_module.desktop
-         DESTINATION ${SERVICES_INSTALL_DIR}/kded
+         DESTINATION ${PLUGIN_INSTALL_DIR}/kf5/kded
 )
 
 find_file(DBUS_SEND_PATH dbus-send HINTS /usr/bin)
diff --git a/telepathy-module.cpp b/telepathy-module.cpp
--- a/telepathy-module.cpp
+++ b/telepathy-module.cpp
@@ -36,7 +36,7 @@
 #include <KConfigGroup>
 #include <KPluginFactory>
 
-K_PLUGIN_FACTORY(TelepathyModuleFactory, registerPlugin<TelepathyModule>(); )
+K_PLUGIN_CLASS_WITH_JSON(TelepathyModule, "ktp_integration_module.json")
 
 TelepathyModule::TelepathyModule(QObject *parent, const QList<QVariant> &args)
     : KDEDModule(parent),