diff --git a/src/conf/CMakeLists.txt b/src/conf/CMakeLists.txt
index 1c90dd11d..352ddb361 100644
--- a/src/conf/CMakeLists.txt
+++ b/src/conf/CMakeLists.txt
@@ -1,69 +1,70 @@
 include_directories(${kleopatra_SOURCE_DIR}/src)
 
 if(BUILD_libkleopatraclient)
 
   set(_kcm_kleopatra_libkleopatraclient_extra_SRCS
     smimevalidationconfigurationwidget.cpp
     smimevalidationconfigurationpage.cpp
     cryptooperationsconfigwidget.cpp
     cryptooperationsconfigpage.cpp
   )
 
   ki18n_wrap_ui(_kcm_kleopatra_libkleopatraclient_extra_SRCS
     smimevalidationconfigurationwidget.ui
   )
 
   kconfig_add_kcfg_files(_kcm_kleopatra_libkleopatraclient_extra_SRCS
     ${kleopatra_SOURCE_DIR}/src/kcfg/smimevalidationpreferences.kcfgc
   )
 
   set(_kcm_kleopatra_libkleopatraclient_extra_LIBS kleopatraclientgui)
 
 else()
 
   set(_kcm_kleopatra_libkleopatraclient_extra_SRCS)
   set(_kcm_kleopatra_libkleopatraclient_extra_LIBS)
 
 endif()
 
 set(kcm_kleopatra_PART_SRCS
   dirservconfigpage.cpp
   appearanceconfigpage.cpp
   appearanceconfigwidget.cpp
   gnupgsystemconfigurationpage.cpp
   ${kleopatra_BINARY_DIR}/src/kleopatra_debug.cpp
   ${_kcm_kleopatra_libkleopatraclient_extra_SRCS}
 )
 
 
 ki18n_wrap_ui(kcm_kleopatra_PART_SRCS
   appearanceconfigwidget.ui
   smimevalidationconfigurationwidget.ui
 )
 
 kconfig_add_kcfg_files(kcm_kleopatra_PART_SRCS
   ${kleopatra_SOURCE_DIR}/src/kcfg/tooltippreferences.kcfgc
   ${kleopatra_SOURCE_DIR}/src/kcfg/emailoperationspreferences.kcfgc
   ${kleopatra_SOURCE_DIR}/src/kcfg/fileoperationspreferences.kcfgc
   ${kleopatra_SOURCE_DIR}/src/kcfg/tagspreferences.kcfgc
   ${kleopatra_SOURCE_DIR}/src/kcfg/settings.kcfgc
 )
 
 add_library(kcm_kleopatra_static STATIC ${kcm_kleopatra_PART_SRCS})
 
 target_link_libraries(kcm_kleopatra_static
   KF5::Libkleo
   KF5::IconThemes
   KF5::I18n
   KF5::WidgetsAddons
   KF5::ConfigWidgets
   ${_kcm_kleopatra_extra_libs}
   ${_kleopatra_dbusaddons_libs}
   ${_kcm_kleopatra_libkleopatraclient_extra_LIBS}
 )
 
 add_library(kleopatra_config_gnupgsystem MODULE kcm_gnupgsystemconfigurationpage.cpp)
+kcoreaddons_desktop_to_json(kleopatra_config_gnupgsystem kleopatra_config_gnupgsystem.desktop)
 target_link_libraries(kleopatra_config_gnupgsystem kcm_kleopatra_static KF5::CoreAddons)
 
 install(FILES kleopatra_config_gnupgsystem.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR})
 install(TARGETS kleopatra_config_gnupgsystem DESTINATION ${KDE_INSTALL_PLUGINDIR}/pim/kcms/kleopatra)
diff --git a/src/conf/kcm_gnupgsystemconfigurationpage.cpp b/src/conf/kcm_gnupgsystemconfigurationpage.cpp
index 02d1ff4c9..d0d726e7a 100644
--- a/src/conf/kcm_gnupgsystemconfigurationpage.cpp
+++ b/src/conf/kcm_gnupgsystemconfigurationpage.cpp
@@ -1,11 +1,12 @@
 /*
    SPDX-FileCopyrightText: 2021 Alexander Lohnau <alexander.lohnau@gmx.de>
    SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL
 */
 
 #include "gnupgsystemconfigurationpage.h"
 #include <KPluginFactory>
 
-K_PLUGIN_FACTORY(GnuPGSystemConfigurationPageFactory, registerPlugin<Kleo::Config::GnuPGSystemConfigurationPage>();)
+using namespace Kleo::Config;
+K_PLUGIN_CLASS_WITH_JSON(GnuPGSystemConfigurationPage, "kleopatra_config_gnupgsystem.json")
 
 #include "kcm_gnupgsystemconfigurationpage.moc"