diff --git a/src/service/plugins/activitytemplates/CMakeLists.txt b/src/service/plugins/activitytemplates/CMakeLists.txt
index da88f1c5..8eefc001 100644
--- a/src/service/plugins/activitytemplates/CMakeLists.txt
+++ b/src/service/plugins/activitytemplates/CMakeLists.txt
@@ -1,48 +1,44 @@
 # vim:set softtabstop=3 shiftwidth=3 tabstop=3 expandtab:
 
 project (kactivitymanagerd-plugin-activitytemplates)
 
 include_directories (
    ${KACTIVITIES_CURRENT_ROOT_SOURCE_DIR}/src
    ${CMAKE_BINARY_DIR}/src
    ${CMAKE_CURRENT_SOURCE_DIR}
    ${CMAKE_CURRENT_SOURCE_DIR}/../..
    ${CMAKE_CURRENT_BINARY_DIR}
    ${KConfig_INCLUDE_DIR}
    )
 
 set (
    activitytemplates_SRCS
    TemplatesPlugin.cpp
    ${plugin_implementation_SRCS}
    )
 
 qt5_add_dbus_adaptor (
    activitytemplates_SRCS org.kde.ActivityManager.Templates.xml
    TemplatesPlugin.h TemplatesPlugin
    )
 
-add_library (
-   kactivitymanagerd_plugin_activitytemplates SHARED
-   ${activitytemplates_SRCS}
+kcoreaddons_add_plugin(
+   kactivitymanagerd_plugin_activitytemplates
+   JSON kactivitymanagerd-plugin-activitytemplates.json
+   SOURCES ${activitytemplates_SRCS}
+   INSTALL_NAMESPACE ${KAMD_PLUGIN_DIR}
    )
 
 target_link_libraries (
    kactivitymanagerd_plugin_activitytemplates
    Qt5::Core
    Qt5::DBus
    KF5::ConfigCore
    KF5::DBusAddons
    KF5::CoreAddons
    )
 
 set_target_properties (
    kactivitymanagerd_plugin_activitytemplates
    PROPERTIES PREFIX ""
    )
-
-
-install (
-   TARGETS kactivitymanagerd_plugin_activitytemplates
-   DESTINATION ${KAMD_PLUGIN_DIR}
-   )
diff --git a/src/service/plugins/eventspy/CMakeLists.txt b/src/service/plugins/eventspy/CMakeLists.txt
index 99e8c628..13c03736 100644
--- a/src/service/plugins/eventspy/CMakeLists.txt
+++ b/src/service/plugins/eventspy/CMakeLists.txt
@@ -1,44 +1,41 @@
 # vim:set softtabstop=3 shiftwidth=3 tabstop=3 expandtab:
 
 project (activitymanager-eventspy)
 
 find_package (KF5KIO ${KF5_DEP_VERSION} CONFIG REQUIRED)
 
 include_directories (
    ${KACTIVITIES_CURRENT_ROOT_SOURCE_DIR}/src
    ${CMAKE_BINARY_DIR}/src
    ${CMAKE_CURRENT_SOURCE_DIR}
    ${CMAKE_CURRENT_SOURCE_DIR}/../..
    ${CMAKE_CURRENT_BINARY_DIR}
    ${KConfig_INCLUDE_DIR}
    )
 
 set (
    evenyspy_SRCS
    EventSpy.cpp
    ${plugin_implementation_SRCS}
    )
 
-add_library (
-   kactivitymanagerd_plugin_eventspy SHARED
-   ${evenyspy_SRCS}
+kcoreaddons_add_plugin(
+   kactivitymanagerd_plugin_eventspy
+   JSON kactivitymanagerd-plugin-eventspy.json
+   SOURCES ${evenyspy_SRCS}
+   INSTALL_NAMESPACE ${KAMD_PLUGIN_DIR}
    )
 
 target_link_libraries (
    kactivitymanagerd_plugin_eventspy
    Qt5::Core
    Qt5::DBus
    KF5::ConfigCore
    KF5::CoreAddons
    KF5::KIOCore
    )
 
 set_target_properties (
    kactivitymanagerd_plugin_eventspy
    PROPERTIES PREFIX ""
    )
-
-install (
-   TARGETS kactivitymanagerd_plugin_eventspy
-   DESTINATION ${KAMD_PLUGIN_DIR}
-   )
diff --git a/src/service/plugins/globalshortcuts/CMakeLists.txt b/src/service/plugins/globalshortcuts/CMakeLists.txt
index 51626a51..e05223dc 100644
--- a/src/service/plugins/globalshortcuts/CMakeLists.txt
+++ b/src/service/plugins/globalshortcuts/CMakeLists.txt
@@ -1,45 +1,42 @@
 # vim:set softtabstop=3 shiftwidth=3 tabstop=3 expandtab:
 
 project (activitymanager-globalshortcuts)
 
 include_directories (
    ${KACTIVITIES_CURRENT_ROOT_SOURCE_DIR}/src
    ${CMAKE_BINARY_DIR}/src
    ${CMAKE_CURRENT_SOURCE_DIR}
    ${CMAKE_CURRENT_SOURCE_DIR}/../..
    ${CMAKE_CURRENT_BINARY_DIR}
    ${KConfig_INCLUDE_DIR}
    )
 
 set (
    globalshortcuts_SRCS
    GlobalShortcutsPlugin.cpp
    ${plugin_implementation_SRCS}
    )
 
-add_library (
-   kactivitymanagerd_plugin_globalshortcuts SHARED
-   ${globalshortcuts_SRCS}
+kcoreaddons_add_plugin(
+   kactivitymanagerd_plugin_globalshortcuts
+   JSON kactivitymanagerd-plugin-globalshortcuts.json
+   SOURCES ${globalshortcuts_SRCS}
+   INSTALL_NAMESPACE ${KAMD_PLUGIN_DIR}
    )
 
 target_link_libraries (
    kactivitymanagerd_plugin_globalshortcuts
    Qt5::Core
    Qt5::DBus
    Qt5::Widgets
    KF5::ConfigCore
    KF5::GlobalAccel
    KF5::I18n
    KF5::XmlGui
    KF5::CoreAddons
    )
 
 set_target_properties (
    kactivitymanagerd_plugin_globalshortcuts
    PROPERTIES PREFIX ""
    )
-
-install (
-   TARGETS kactivitymanagerd_plugin_globalshortcuts
-   DESTINATION ${KAMD_PLUGIN_DIR}
-   )
diff --git a/src/service/plugins/slc/CMakeLists.txt b/src/service/plugins/slc/CMakeLists.txt
index 72c5e804..57684750 100644
--- a/src/service/plugins/slc/CMakeLists.txt
+++ b/src/service/plugins/slc/CMakeLists.txt
@@ -1,49 +1,46 @@
 # vim:set softtabstop=3 shiftwidth=3 tabstop=3 expandtab:
 
 project (activitymanager-plugin-slc)
 
 # kservice_desktop_to_json (activitymanager-plugin-slc.desktop)
 
 include_directories (
    ${KACTIVITIES_CURRENT_ROOT_SOURCE_DIR}/src
    ${CMAKE_BINARY_DIR}/src
    ${CMAKE_CURRENT_SOURCE_DIR}
    ${CMAKE_CURRENT_SOURCE_DIR}/../..
    ${CMAKE_CURRENT_BINARY_DIR}
    ${KConfig_INCLUDE_DIR}
    )
 
 set (
    slc_SRCS
    SlcPlugin.cpp
    ${plugin_implementation_SRCS}
    )
 
 qt5_add_dbus_adaptor (
    slc_SRCS org.kde.ActivityManager.SLC.xml
    SlcPlugin.h SlcPlugin
    )
 
-add_library (
-   kactivitymanagerd_plugin_slc SHARED
-   ${slc_SRCS}
+kcoreaddons_add_plugin(
+   kactivitymanagerd_plugin_slc
+   JSON kactivitymanagerd-plugin-slc.json
+   SOURCES ${slc_SRCS}
+   INSTALL_NAMESPACE ${KAMD_PLUGIN_DIR}
    )
 
 target_link_libraries (
    kactivitymanagerd_plugin_slc
    Qt5::Core
    Qt5::DBus
    KF5::ConfigCore
    KF5::DBusAddons
    KF5::CoreAddons
    )
 
 set_target_properties (
    kactivitymanagerd_plugin_slc
    PROPERTIES PREFIX ""
    )
-
-install (
-   TARGETS kactivitymanagerd_plugin_slc
-   DESTINATION ${KAMD_PLUGIN_DIR}
-   )
diff --git a/src/service/plugins/sqlite/CMakeLists.txt b/src/service/plugins/sqlite/CMakeLists.txt
index e7440d5e..d7c5b153 100644
--- a/src/service/plugins/sqlite/CMakeLists.txt
+++ b/src/service/plugins/sqlite/CMakeLists.txt
@@ -1,68 +1,65 @@
 # vim:set softtabstop=3 shiftwidth=3 tabstop=3 expandtab:
 
 project (kactivitymanagerd-plugin-sqlite)
 
 set (
    sqliteplugin_SRCS
    Database.cpp
    StatsPlugin.cpp
    ResourceScoreCache.cpp
    ResourceScoreMaintainer.cpp
    ResourceLinking.cpp
 
    ${KACTIVITIES_CURRENT_ROOT_SOURCE_DIR}/src/common/database/Database.cpp
    ${KACTIVITIES_CURRENT_ROOT_SOURCE_DIR}/src/common/database/schema/ResourcesDatabaseSchema.cpp
 
    ${KACTIVITIES_CURRENT_ROOT_SOURCE_DIR}/src/utils/qsqlquery_iterator.cpp
 
    ${plugin_implementation_SRCS}
    )
 
 qt5_add_dbus_adaptor (
    sqliteplugin_SRCS
    ${KACTIVITIES_CURRENT_ROOT_SOURCE_DIR}/src/common/dbus/org.kde.ActivityManager.ResourcesLinking.xml
    ResourceLinking.h ResourceLinking
    resourcelinkingadaptor
    )
 
 qt5_add_dbus_adaptor (
    sqliteplugin_SRCS
    ${KACTIVITIES_CURRENT_ROOT_SOURCE_DIR}/src/common/dbus/org.kde.ActivityManager.ResourcesScoring.xml
    StatsPlugin.h StatsPlugin
    resourcescoringadaptor
    )
 
 include_directories (
    ${KACTIVITIES_CURRENT_ROOT_SOURCE_DIR}/src
    ${CMAKE_BINARY_DIR}/src
    ${CMAKE_CURRENT_SOURCE_DIR}
    ${CMAKE_CURRENT_SOURCE_DIR}/../..
    ${CMAKE_CURRENT_BINARY_DIR}
    ${CMAKE_CURRENT_BINARY_DIR}/../..
    ${KConfig_INCLUDE_DIR}
    )
 
-add_library (
-   kactivitymanagerd_plugin_sqlite MODULE
-   ${sqliteplugin_SRCS}
+kcoreaddons_add_plugin(
+   kactivitymanagerd_plugin_sqlite
+   JSON kactivitymanagerd-plugin-sqlite.json
+   SOURCES ${sqliteplugin_SRCS}
+   INSTALL_NAMESPACE ${KAMD_PLUGIN_DIR}
    )
 
 target_link_libraries (
    kactivitymanagerd_plugin_sqlite
    Qt5::Core
    Qt5::Sql
    KF5::ConfigCore
    KF5::KIOCore
    KF5::DBusAddons
    KF5::CoreAddons
    )
 
 set_target_properties (
    kactivitymanagerd_plugin_sqlite
    PROPERTIES PREFIX ""
    )
-
-install (
-   TARGETS kactivitymanagerd_plugin_sqlite
-   DESTINATION ${KAMD_PLUGIN_DIR}
-   )
diff --git a/src/service/plugins/virtualdesktopswitch/CMakeLists.txt b/src/service/plugins/virtualdesktopswitch/CMakeLists.txt
index a07f1a41..55ea90e5 100644
--- a/src/service/plugins/virtualdesktopswitch/CMakeLists.txt
+++ b/src/service/plugins/virtualdesktopswitch/CMakeLists.txt
@@ -1,42 +1,39 @@
 # vim:set softtabstop=3 shiftwidth=3 tabstop=3 expandtab:
 
 project (kactivitymanagerd-virtualdesktopswitch)
 
 include_directories (
    ${KACTIVITIES_CURRENT_ROOT_SOURCE_DIR}/src
    ${CMAKE_BINARY_DIR}/src
    ${CMAKE_CURRENT_SOURCE_DIR}
    ${CMAKE_CURRENT_SOURCE_DIR}/../..
    ${CMAKE_CURRENT_BINARY_DIR}
    ${KConfig_INCLUDE_DIR}
    )
 
 set (
    virtualdesktopswitch_SRCS
    VirtualDesktopSwitchPlugin.cpp
    ${plugin_implementation_SRCS}
    )
 
-add_library (
-   kactivitymanagerd_plugin_virtualdesktopswitch SHARED
-   ${virtualdesktopswitch_SRCS}
+kcoreaddons_add_plugin(
+   kactivitymanagerd_plugin_virtualdesktopswitch
+   JSON kactivitymanagerd-plugin-virtualdesktopswitch.json
+   SOURCES ${virtualdesktopswitch_SRCS}
+   INSTALL_NAMESPACE ${KAMD_PLUGIN_DIR}
    )
 
 target_link_libraries (
    kactivitymanagerd_plugin_virtualdesktopswitch
    Qt5::Core
    Qt5::DBus
    KF5::ConfigCore
    KF5::WindowSystem
    KF5::CoreAddons
    )
 
 set_target_properties (
    kactivitymanagerd_plugin_virtualdesktopswitch
    PROPERTIES PREFIX ""
    )
-
-install (
-   TARGETS kactivitymanagerd_plugin_virtualdesktopswitch
-   DESTINATION ${KAMD_PLUGIN_DIR}
-   )