diff --git a/src/ioslaves/http/kcookiejar/CMakeLists.txt b/src/ioslaves/http/kcookiejar/CMakeLists.txt
index 431cf1e8..c99409d8 100644
--- a/src/ioslaves/http/kcookiejar/CMakeLists.txt
+++ b/src/ioslaves/http/kcookiejar/CMakeLists.txt
@@ -1,49 +1,48 @@
 ####### kcookiejar: command line tool for talking to the kded kcookiejar module #######
 qt5_generate_dbus_interface(${CMAKE_CURRENT_SOURCE_DIR}/kcookieserver.h org.kde.KCookieServer.xml)
 set(kcookieserver_xml ${CMAKE_CURRENT_BINARY_DIR}/org.kde.KCookieServer.xml)
 set_source_files_properties(${kcookieserver_xml} PROPERTIES INCLUDE "kcookiejar_include.h")
 qt5_add_dbus_interfaces(kcookiejar_SRCS ${kcookieserver_xml})
 
 set(kcookiejar_SRCS ${kcookiejar_SRCS} main.cpp)
 add_executable( kcookiejar5 ${kcookiejar_SRCS})
 ecm_mark_nongui_executable(kcookiejar5)
 
 target_link_libraries( kcookiejar5
    Qt5::DBus
    KF5::I18n
    KF5::WidgetsAddons
 )
 
 install(TARGETS kcookiejar5 ${KF5_INSTALL_TARGETS_DEFAULT_ARGS} )
 
 ########### kded kcookiejar module ###############
 
 set(kded_kcookiejar_SRCS
    kcookiejar.cpp
    kcookieserver.cpp
    kcookiewin.cpp
 )
 
 qt5_add_dbus_adaptor( kded_kcookiejar_SRCS ${CMAKE_CURRENT_BINARY_DIR}/org.kde.KCookieServer.xml kcookieserver.h KCookieServer )
 
 
 kcoreaddons_add_plugin(kded_kcookiejar INSTALL_NAMESPACE "kf5/kded" JSON kcookiejar.json SOURCES ${kded_kcookiejar_SRCS})
 set_target_properties(kded_kcookiejar PROPERTIES
     OUTPUT_NAME kcookiejar
 )
 
 target_link_libraries(kded_kcookiejar
    KF5::WindowSystem
    KF5::Service # kpluginfactory
    KF5::DBusAddons
    KF5::I18n
    KF5::WidgetsAddons
 )
 
 ########### install files ###############
 
 install( FILES domain_info  DESTINATION  ${KDE_INSTALL_DATADIR_KF5}/kcookiejar )
 install( FILES ${CMAKE_CURRENT_BINARY_DIR}/org.kde.KCookieServer.xml DESTINATION ${KDE_INSTALL_DBUSINTERFACEDIR} RENAME kf5_org.kde.KCookieServer.xml)
 
-configure_file(org.kde.kcookiejar5.service.in ${CMAKE_CURRENT_BINARY_DIR}/org.kde.kcookiejar5.service)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.kde.kcookiejar5.service DESTINATION ${KDE_INSTALL_DBUSSERVICEDIR})
+kdbusaddons_generate_dbus_service_file(kded5 org.kde.kcookiejar5 ${KDE_INSTALL_FULL_BINDIR})
diff --git a/src/ioslaves/http/kcookiejar/org.kde.kcookiejar5.service.in b/src/ioslaves/http/kcookiejar/org.kde.kcookiejar5.service.in
deleted file mode 100644
index 31c91efd..00000000
--- a/src/ioslaves/http/kcookiejar/org.kde.kcookiejar5.service.in
+++ /dev/null
@@ -1,4 +0,0 @@
-[D-BUS Service]
-Name=org.kde.kcookiejar5
-Exec=@CMAKE_INSTALL_PREFIX@/bin/kded5
-
diff --git a/src/kiod/CMakeLists.txt b/src/kiod/CMakeLists.txt
index a65da0c1..8795fbde 100644
--- a/src/kiod/CMakeLists.txt
+++ b/src/kiod/CMakeLists.txt
@@ -1,32 +1,29 @@
 include(ECMMarkNonGuiExecutable)
 
 set(kiod_SRCS kiod_main.cpp)
 if (APPLE)
     set(kiod_SRCS ${kiod_SRCS} kiod_agent.mm)
 endif()
 
 add_executable(kiod5 ${kiod_SRCS})
 
 target_link_libraries(kiod5
    KF5::KIOCore     # ksslcertificatemanager
    KF5::DBusAddons  # kdedmodule
    KF5::CoreAddons  # kpluginfactory
    Qt5::Network
    Qt5::DBus
    Qt5::Widgets     # QApplication
 )
 
 if (APPLE)
     target_link_libraries(kiod5 "-framework AppKit -framework CoreFoundation")
 
     # Mark it as non-gui so we won't create an app bundle on Mac OS X
     ecm_mark_nongui_executable(kiod5)
 endif ()
 
 install(TARGETS kiod5 DESTINATION ${KDE_INSTALL_LIBEXECDIR_KF5})
 
-configure_file(org.kde.kiod5.service.in
-   ${CMAKE_CURRENT_BINARY_DIR}/org.kde.kiod5.service)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.kde.kiod5.service
-   DESTINATION ${KDE_INSTALL_DBUSSERVICEDIR})
+kdbusaddons_generate_dbus_service_file(kiod5 org.kde.kiod5 ${KDE_INSTALL_FULL_LIBEXECDIR_KF5})
 
diff --git a/src/kiod/org.kde.kiod5.service.in b/src/kiod/org.kde.kiod5.service.in
deleted file mode 100644
index 9359627c..00000000
--- a/src/kiod/org.kde.kiod5.service.in
+++ /dev/null
@@ -1,4 +0,0 @@
-[D-BUS Service]
-Name=org.kde.kiod5
-Exec=@KDE_INSTALL_FULL_LIBEXECDIR@/kf5/kiod5
-
diff --git a/src/kioexec/CMakeLists.txt b/src/kioexec/CMakeLists.txt
index 2fc95271..16f6daa4 100644
--- a/src/kioexec/CMakeLists.txt
+++ b/src/kioexec/CMakeLists.txt
@@ -1,47 +1,46 @@
 set(kioexecd_SRCS kioexecd.cpp)
 
 qt5_generate_dbus_interface(${CMAKE_CURRENT_SOURCE_DIR}/kioexecd.h org.kde.KIOExecd.xml)
 qt5_add_dbus_adaptor(kioexecd_SRCS ${CMAKE_CURRENT_BINARY_DIR}/org.kde.KIOExecd.xml kioexecd.h KIOExecd)
 
 
 ecm_qt_declare_logging_category(kioexecd_SRCS
     HEADER kioexecdebug.h
     IDENTIFIER KIOEXEC
     CATEGORY_NAME kf5.kio.execd)
 
 kcoreaddons_add_plugin(kioexecd
     SOURCES ${kioexecd_SRCS}
     JSON kioexecd.json
     INSTALL_NAMESPACE "kf5/kiod")
 
 target_link_libraries(kioexecd KF5::I18n KF5::DBusAddons KF5::WidgetsAddons KF5::KIOCore)
 
-configure_file(org.kde.kioexecd.service.in ${CMAKE_CURRENT_BINARY_DIR}/org.kde.kioexecd.service)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.kde.kioexecd.service DESTINATION ${KDE_INSTALL_DBUSSERVICEDIR})
+kdbusaddons_generate_dbus_service_file(kiod5 org.kde.kioexecd ${KDE_INSTALL_FULL_LIBEXECDIR_KF5})
 
 # next target
 
 set(kioexec_SRCS main.cpp)
 qt5_add_dbus_interface(kioexec_SRCS ${CMAKE_CURRENT_BINARY_DIR}/org.kde.KIOExecd.xml kioexecdinterface)
 
 add_executable(kioexec ${kioexec_SRCS})
 
 configure_file(config-kioexec.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-kioexec.h)
 
 ecm_mark_nongui_executable(kioexec)
 
 target_link_libraries(kioexec
     Qt5::Widgets
     KF5::I18n
     KF5::KIOWidgets    # KRun
     KF5::WidgetsAddons # KMessageBox
     KF5::WindowSystem  # KStartupInfo
     KF5::DBusAddons    # KDBusService
  )
 
 if (HAVE_X11)
     target_link_libraries(kioexec Qt5::X11Extras)
 endif()
 
 install(TARGETS kioexec DESTINATION ${KDE_INSTALL_LIBEXECDIR_KF5} )
 
diff --git a/src/kioexec/org.kde.kioexecd.service.in b/src/kioexec/org.kde.kioexecd.service.in
deleted file mode 100644
index 4c05cf67..00000000
--- a/src/kioexec/org.kde.kioexecd.service.in
+++ /dev/null
@@ -1,3 +0,0 @@
-[D-BUS Service]
-Name=org.kde.kioexecd
-Exec=@KDE_INSTALL_FULL_LIBEXECDIR@/kf5/kiod5
diff --git a/src/kpasswdserver/CMakeLists.txt b/src/kpasswdserver/CMakeLists.txt
index a98356e6..3cc98c0f 100644
--- a/src/kpasswdserver/CMakeLists.txt
+++ b/src/kpasswdserver/CMakeLists.txt
@@ -1,38 +1,37 @@
 find_package(KF5Wallet ${KF5_DEP_VERSION})
 
 # tell what is missing without wallet
 set_package_properties(KF5Wallet PROPERTIES DESCRIPTION "Safe desktop-wide storage for passwords"
                        TYPE OPTIONAL
                        PURPOSE "Required to have permanent storage of passwords for kpasswdserver"
                       )
 
 if (KF5Wallet_FOUND)
     add_definitions(-DHAVE_KF5WALLET)
     set(WALLET_LIB KF5::Wallet)
 endif()
 
 if(BUILD_TESTING)
     add_subdirectory(autotests)
 endif()
 
 set(kiod_kpasswdserver_SRCS kpasswdserver.cpp kiod_kpasswdserver.cpp)
 
 qt5_add_dbus_adaptor(kiod_kpasswdserver_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/../core/org.kde.KPasswdServer.xml kpasswdserver.h KPasswdServer)
 
 kcoreaddons_add_plugin(kiod_kpasswdserver INSTALL_NAMESPACE "kf5/kiod" JSON kpasswdserver.json SOURCES ${kiod_kpasswdserver_SRCS})
 set_target_properties(kiod_kpasswdserver PROPERTIES
     OUTPUT_NAME kpasswdserver
 )
 
 target_link_libraries(kiod_kpasswdserver
    KF5::DBusAddons    # KDED Module
    Qt5::DBus
    KF5::KIOCore
    KF5::WidgetsAddons # KPasswordDialog
    KF5::I18n
    KF5::WindowSystem
    ${WALLET_LIB}
 )
 
-configure_file(org.kde.kpasswdserver.service.in ${CMAKE_CURRENT_BINARY_DIR}/org.kde.kpasswdserver.service)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.kde.kpasswdserver.service DESTINATION ${KDE_INSTALL_DBUSSERVICEDIR})
+kdbusaddons_generate_dbus_service_file(kiod5 org.kde.kpasswdserver ${KDE_INSTALL_FULL_LIBEXECDIR_KF5})
diff --git a/src/kpasswdserver/org.kde.kpasswdserver.service.in b/src/kpasswdserver/org.kde.kpasswdserver.service.in
deleted file mode 100644
index 3d9b6162..00000000
--- a/src/kpasswdserver/org.kde.kpasswdserver.service.in
+++ /dev/null
@@ -1,4 +0,0 @@
-[D-BUS Service]
-Name=org.kde.kpasswdserver
-Exec=@KDE_INSTALL_FULL_LIBEXECDIR@/kf5/kiod5
-
diff --git a/src/kssld/CMakeLists.txt b/src/kssld/CMakeLists.txt
index 44c731e3..a685d3da 100644
--- a/src/kssld/CMakeLists.txt
+++ b/src/kssld/CMakeLists.txt
@@ -1,19 +1,18 @@
 
 ########### kssld kiod module ###############
 
 set(kssld_SRCS kssld.cpp )
 
 kcoreaddons_add_plugin(kssld INSTALL_NAMESPACE "kf5/kiod" JSON kssld.json SOURCES ${kssld_SRCS})
 
 target_link_libraries(kssld
 PUBLIC
    KF5::KIOCore     # ksslcertificatemanager
    KF5::DBusAddons # kdedmodule
 PRIVATE
    KF5::CoreAddons  # kpluginfactory
    Qt5::Network
    Qt5::DBus
 )
 
-configure_file(org.kde.kssld5.service.in ${CMAKE_CURRENT_BINARY_DIR}/org.kde.kssld5.service)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.kde.kssld5.service DESTINATION ${KDE_INSTALL_DBUSSERVICEDIR})
+kdbusaddons_generate_dbus_service_file(kiod5 org.kde.kssld5 ${KDE_INSTALL_FULL_LIBEXECDIR_KF5})
diff --git a/src/kssld/org.kde.kssld5.service.in b/src/kssld/org.kde.kssld5.service.in
deleted file mode 100644
index 33379bf6..00000000
--- a/src/kssld/org.kde.kssld5.service.in
+++ /dev/null
@@ -1,4 +0,0 @@
-[D-BUS Service]
-Name=org.kde.kssld5
-Exec=@KDE_INSTALL_FULL_LIBEXECDIR@/kf5/kiod5
-