diff --git a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -47,7 +47,7 @@
 set(AKONADI_VERSION "5.14.40")
 set(CALENDARUTILS_LIB_VERSION "5.14.40")
 set(KDEPIM_APPS_LIB_VERSION "5.14.40")
-set(KONTACTINTERFACE_LIB_VERSION "5.14.41")
+set(KONTACTINTERFACE_LIB_VERSION "5.14.42")
 set(KPIMTEXTEDIT_LIB_VERSION "5.14.40")
 set(LIBKDEPIM_LIB_VERSION "5.14.40")
 set(KMIME_LIB_VERSION "5.14.40")
diff --git a/src/kontactplugin/CMakeLists.txt b/src/kontactplugin/CMakeLists.txt
--- a/src/kontactplugin/CMakeLists.txt
+++ b/src/kontactplugin/CMakeLists.txt
@@ -31,17 +31,19 @@
                       KF5::CalendarCore
                       KF5::CalendarUtils
                       KF5::KontactInterface
-                      KF5::Libkdepim 
+                      KF5::Libkdepim
                       notesharedprivate
                       KF5::DNSSD
                       KF5::Mime
                       KF5::KCMUtils
                       KF5::AkonadiWidgets
                       KF5::AkonadiNotes
                       KF5::ItemViews
-		      KF5::Contacts
+                      KF5::Contacts
 )
 
+kcoreaddons_desktop_to_json(kontact_knotesplugin knotesplugin.desktop)
+
 ########### install files ###############
 
 set(kcm_knotessummary_PART_SRCS kcmknotessummary.cpp )
@@ -56,7 +58,7 @@
 install(FILES kcmknotessummary.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR})
 
 
-install(TARGETS kontact_knotesplugin DESTINATION ${KDE_INSTALL_PLUGINDIR})
+install(TARGETS kontact_knotesplugin DESTINATION ${KDE_INSTALL_PLUGINDIR}/kontact5)
 install(FILES knotes_part.rc DESTINATION ${KDE_INSTALL_KXMLGUI5DIR}/knotes)
 install(FILES knotesplugin.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR}/kontact)
 install(FILES org.kde.kontact.KNotes.xml DESTINATION ${KDE_INSTALL_DBUSINTERFACEDIR})
diff --git a/src/kontactplugin/knotes_plugin.cpp b/src/kontactplugin/knotes_plugin.cpp
--- a/src/kontactplugin/knotes_plugin.cpp
+++ b/src/kontactplugin/knotes_plugin.cpp
@@ -50,7 +50,7 @@
 #include <QDropEvent>
 #include <QStandardPaths>
 
-EXPORT_KONTACT_PLUGIN(KNotesPlugin, knotes)
+EXPORT_KONTACT_PLUGIN_WITH_JSON(KNotesPlugin, knotes, "knotesplugin.json")
 
 KNotesPlugin::KNotesPlugin(KontactInterface::Core *core, const QVariantList &)
     : KontactInterface::Plugin(core, core, "knotes")
diff --git a/src/kontactplugin/knotesplugin.desktop b/src/kontactplugin/knotesplugin.desktop
--- a/src/kontactplugin/knotesplugin.desktop
+++ b/src/kontactplugin/knotesplugin.desktop
@@ -3,7 +3,7 @@
 Icon=view-pim-notes
 X-KDE-ServiceTypes=Kontact/Plugin,KPluginInfo
 
-X-KDE-Library=kontact_knotesplugin
+X-KDE-Library=kontact5/kontact_knotesplugin
 X-KDE-KontactPluginVersion=10
 X-KDE-KontactPluginHasSummary=true
 X-KDE-KontactPartExecutableName=knotes