diff --git a/src/ioslaves/http/kcookiejar/CMakeLists.txt b/src/ioslaves/http/kcookiejar/CMakeLists.txt
--- a/src/ioslaves/http/kcookiejar/CMakeLists.txt
+++ b/src/ioslaves/http/kcookiejar/CMakeLists.txt
@@ -45,5 +45,4 @@
 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
--- 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
--- a/src/kiod/CMakeLists.txt
+++ b/src/kiod/CMakeLists.txt
@@ -25,8 +25,5 @@
 
 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
--- 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
--- a/src/kioexec/CMakeLists.txt
+++ b/src/kioexec/CMakeLists.txt
@@ -16,8 +16,7 @@
 
 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
 
diff --git a/src/kioexec/org.kde.kioexecd.service.in b/src/kioexec/org.kde.kioexecd.service.in
deleted file mode 100644
--- 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
--- a/src/kpasswdserver/CMakeLists.txt
+++ b/src/kpasswdserver/CMakeLists.txt
@@ -34,5 +34,4 @@
    ${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
--- 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
--- a/src/kssld/CMakeLists.txt
+++ b/src/kssld/CMakeLists.txt
@@ -15,5 +15,4 @@
    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
--- 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
-