diff --git a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -48,7 +48,7 @@
 set(KMAILTRANSPORT_LIB_VERSION "5.14.40")
 set(CALENDARUTILS_LIB_VERSION "5.14.40")
 set(AKONADICALENDAR_LIB_VERSION "5.14.41")
-set(KONTACTINTERFACE_LIB_VERSION "5.14.41")
+set(KONTACTINTERFACE_LIB_VERSION "5.14.42")
 set(KMIME_LIB_VERSION "5.14.40")
 set(KPIMTEXTEDIT_LIB_VERSION "5.14.40")
 set(AKONADI_VERSION "5.14.40")
diff --git a/src/kontactplugin/korganizer/CMakeLists.txt b/src/kontactplugin/korganizer/CMakeLists.txt
--- a/src/kontactplugin/korganizer/CMakeLists.txt
+++ b/src/kontactplugin/korganizer/CMakeLists.txt
@@ -15,6 +15,8 @@
 
 target_link_libraries(kontact_korganizerplugin KF5::AkonadiCalendar KF5::CalendarUtils KF5::Contacts KF5::CalendarCore KF5::Libkdepim KF5::KontactInterface korganizerprivate KF5::CalendarSupport KF5::AkonadiCalendar KF5::WindowSystem KF5::I18n)
 
+kcoreaddons_desktop_to_json(kontact_korganizerplugin korganizerplugin.desktop)
+
 ########### next target ###############
 
 set(kontact_todoplugin_PART_SRCS todoplugin.cpp todosummarywidget.cpp ${libcommon_SRCS})
@@ -25,6 +27,8 @@
 
 target_link_libraries(kontact_todoplugin KF5::AkonadiCalendar  KF5::Contacts KF5::Libkdepim KF5::KontactInterface KF5::CalendarCore KF5::CalendarUtils KF5::CalendarSupport KF5::AkonadiCalendar KF5::WindowSystem)
 
+kcoreaddons_desktop_to_json(kontact_todoplugin todoplugin.desktop)
+
 ########### next target ###############
 
 set(kontact_journalplugin_PART_SRCS journalplugin.cpp ${libcommon_SRCS})
@@ -35,6 +39,8 @@
 
 target_link_libraries(kontact_journalplugin  KF5::KontactInterface KF5::WindowSystem)
 
+kcoreaddons_desktop_to_json(kontact_journalplugin journalplugin.desktop)
+
 ########### next target ###############
 
 set(kcm_apptsummary_PART_SRCS kcmapptsummary.cpp)
@@ -63,9 +69,9 @@
 
 install(TARGETS kcm_apptsummary DESTINATION ${KDE_INSTALL_PLUGINDIR})
 install(TARGETS kcm_todosummary DESTINATION ${KDE_INSTALL_PLUGINDIR})
-install(TARGETS kontact_korganizerplugin DESTINATION ${KDE_INSTALL_PLUGINDIR})
-install(TARGETS kontact_todoplugin DESTINATION ${KDE_INSTALL_PLUGINDIR})
-install(TARGETS kontact_journalplugin DESTINATION ${KDE_INSTALL_PLUGINDIR})
+install(TARGETS kontact_korganizerplugin DESTINATION ${KDE_INSTALL_PLUGINDIR}/kontact5)
+install(TARGETS kontact_todoplugin DESTINATION ${KDE_INSTALL_PLUGINDIR}/kontact5)
+install(TARGETS kontact_journalplugin DESTINATION ${KDE_INSTALL_PLUGINDIR}/kontact5)
 
 install(FILES korganizerplugin.desktop todoplugin.desktop journalplugin.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR}/kontact)
 install(FILES kcmapptsummary.desktop kcmtodosummary.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR})
diff --git a/src/kontactplugin/korganizer/journalplugin.cpp b/src/kontactplugin/korganizer/journalplugin.cpp
--- a/src/kontactplugin/korganizer/journalplugin.cpp
+++ b/src/kontactplugin/korganizer/journalplugin.cpp
@@ -34,7 +34,7 @@
 #include <QAction>
 #include <QIcon>
 
-EXPORT_KONTACT_PLUGIN(JournalPlugin, journal)
+EXPORT_KONTACT_PLUGIN_WITH_JSON(JournalPlugin, journal, "journalplugin.json")
 
 JournalPlugin::JournalPlugin(KontactInterface::Core *core, const QVariantList &)
     : KontactInterface::Plugin(core, core, "korganizer", "journal")
diff --git a/src/kontactplugin/korganizer/journalplugin.desktop b/src/kontactplugin/korganizer/journalplugin.desktop
--- a/src/kontactplugin/korganizer/journalplugin.desktop
+++ b/src/kontactplugin/korganizer/journalplugin.desktop
@@ -3,7 +3,7 @@
 Icon=view-pim-journal
 X-KDE-ServiceTypes=Kontact/Plugin
 
-X-KDE-Library=kontact_journalplugin
+X-KDE-Library=kontact5/kontact_journalplugin
 X-KDE-KontactPluginVersion=10
 X-KDE-KontactPartLibraryName=korganizerpart
 X-KDE-KontactPartExecutableName=korganizer
diff --git a/src/kontactplugin/korganizer/korganizerplugin.cpp b/src/kontactplugin/korganizer/korganizerplugin.cpp
--- a/src/kontactplugin/korganizer/korganizerplugin.cpp
+++ b/src/kontactplugin/korganizer/korganizerplugin.cpp
@@ -49,7 +49,7 @@
 #include <QDropEvent>
 #include <QStandardPaths>
 
-EXPORT_KONTACT_PLUGIN(KOrganizerPlugin, korganizer)
+EXPORT_KONTACT_PLUGIN_WITH_JSON(KOrganizerPlugin, korganizer, "korganizerplugin.json")
 
 KOrganizerPlugin::KOrganizerPlugin(KontactInterface::Core *core, const QVariantList &)
     : KontactInterface::Plugin(core, core, "korganizer", "calendar")
diff --git a/src/kontactplugin/korganizer/korganizerplugin.desktop b/src/kontactplugin/korganizer/korganizerplugin.desktop
--- a/src/kontactplugin/korganizer/korganizerplugin.desktop
+++ b/src/kontactplugin/korganizer/korganizerplugin.desktop
@@ -3,7 +3,7 @@
 Icon=view-pim-calendar
 X-KDE-ServiceTypes=Kontact/Plugin,KPluginInfo
 
-X-KDE-Library=kontact_korganizerplugin
+X-KDE-Library=kontact5/kontact_korganizerplugin
 X-KDE-KontactPluginVersion=10
 X-KDE-KontactPartLibraryName=korganizerpart
 X-KDE-KontactPartExecutableName=korganizer
diff --git a/src/kontactplugin/korganizer/todoplugin.cpp b/src/kontactplugin/korganizer/todoplugin.cpp
--- a/src/kontactplugin/korganizer/todoplugin.cpp
+++ b/src/kontactplugin/korganizer/todoplugin.cpp
@@ -47,7 +47,7 @@
 
 #include <QDropEvent>
 
-EXPORT_KONTACT_PLUGIN(TodoPlugin, todo)
+EXPORT_KONTACT_PLUGIN_WITH_JSON(TodoPlugin, todo, "todoplugin.json")
 
 TodoPlugin::TodoPlugin(KontactInterface::Core *core, const QVariantList &)
     : KontactInterface::Plugin(core, core, "korganizer", "todo")
diff --git a/src/kontactplugin/korganizer/todoplugin.desktop b/src/kontactplugin/korganizer/todoplugin.desktop
--- a/src/kontactplugin/korganizer/todoplugin.desktop
+++ b/src/kontactplugin/korganizer/todoplugin.desktop
@@ -3,7 +3,7 @@
 Icon=view-pim-tasks
 X-KDE-ServiceTypes=Kontact/Plugin
 
-X-KDE-Library=kontact_todoplugin
+X-KDE-Library=kontact5/kontact_todoplugin
 X-KDE-KontactPluginVersion=10
 X-KDE-KontactPartLibraryName=korganizerpart
 X-KDE-KontactPartExecutableName=korganizer
diff --git a/src/kontactplugin/specialdates/CMakeLists.txt b/src/kontactplugin/specialdates/CMakeLists.txt
--- a/src/kontactplugin/specialdates/CMakeLists.txt
+++ b/src/kontactplugin/specialdates/CMakeLists.txt
@@ -24,6 +24,8 @@
   KF5::CalendarSupport
 )
 
+kcoreaddons_desktop_to_json(kontact_specialdatesplugin specialdatesplugin.desktop)
+
 ########### next target ###############
 
 set(kcm_sdsummary_PART_SRCS kcmsdsummary.cpp)
@@ -36,7 +38,7 @@
 
 ########### install files ###############
 
-install(TARGETS kontact_specialdatesplugin DESTINATION ${KDE_INSTALL_PLUGINDIR})
+install(TARGETS kontact_specialdatesplugin DESTINATION ${KDE_INSTALL_PLUGINDIR}/kontact5)
 install(TARGETS kcm_sdsummary DESTINATION ${KDE_INSTALL_PLUGINDIR})
 
 install(FILES specialdatesplugin.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR}/kontact)
diff --git a/src/kontactplugin/specialdates/specialdates_plugin.cpp b/src/kontactplugin/specialdates/specialdates_plugin.cpp
--- a/src/kontactplugin/specialdates/specialdates_plugin.cpp
+++ b/src/kontactplugin/specialdates/specialdates_plugin.cpp
@@ -31,7 +31,7 @@
 #include <KAboutData>
 #include <KLocalizedString>
 
-EXPORT_KONTACT_PLUGIN(SpecialdatesPlugin, specialdates)
+EXPORT_KONTACT_PLUGIN_WITH_JSON(SpecialdatesPlugin, specialdates, "specialdatesplugin.json")
 
 SpecialdatesPlugin::SpecialdatesPlugin(KontactInterface::Core *core, const QVariantList &)
     : KontactInterface::Plugin(core, core, nullptr)
diff --git a/src/kontactplugin/specialdates/specialdatesplugin.desktop b/src/kontactplugin/specialdates/specialdatesplugin.desktop
--- a/src/kontactplugin/specialdates/specialdatesplugin.desktop
+++ b/src/kontactplugin/specialdates/specialdatesplugin.desktop
@@ -3,7 +3,7 @@
 Icon=view-calendar-special-occasion
 X-KDE-ServiceTypes=Kontact/Plugin,KPluginInfo
 
-X-KDE-Library=kontact_specialdatesplugin
+X-KDE-Library=kontact5/kontact_specialdatesplugin
 X-KDE-KontactPluginVersion=10
 X-KDE-KontactPluginHasPart=false
 X-KDE-KontactPluginHasSummary=true