diff --git a/CMakeLists.txt b/CMakeLists.txt
index f47888b4..87408d9a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,78 +1,78 @@
 cmake_minimum_required(VERSION 3.0)
 set(PIM_VERSION "5.8.40")
 
 project(KContacts VERSION ${PIM_VERSION})
 
 # ECM setup
 set(QT_REQUIRED_VERSION "5.8.0")
 set(KF5_VERSION "5.44.0")
 
 find_package(ECM ${KF5_VERSION} CONFIG REQUIRED)
 set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${KContacts_SOURCE_DIR}/cmake)
 
 include(GenerateExportHeader)
 include(ECMGenerateHeaders)
 include(ECMGeneratePriFile)
 include(CMakePackageConfigHelpers)
 include(ECMSetupVersion)
 include(FeatureSummary)
 include(KDEInstallDirs)
 include(KDECMakeSettings)
 include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
 include(ECMQtDeclareLoggingCategory)
 include(ECMCoverageOption)
 
 
 
 set(KCONTACTS_LIB_VERSION ${PIM_VERSION})
 
 ecm_setup_version(PROJECT VARIABLE_PREFIX KContacts
                         VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/kcontacts_version.h"
                         PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KF5ContactsConfigVersion.cmake"
                         SOVERSION 5
 )
 
 ########### Find packages ###########
-find_package(Qt5 ${QT_REQUIRED_VERSION} REQUIRED COMPONENTS DBus Gui)
+find_package(Qt5 ${QT_REQUIRED_VERSION} REQUIRED COMPONENTS Gui)
 find_package(KF5 ${KF5_VERSION} REQUIRED COMPONENTS CoreAddons I18n Config Codecs)
 
 ########### Targets ###########
 
 add_definitions(-DTRANSLATION_DOMAIN=\"kcontacts5\")
 add_definitions("-DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII")
 add_definitions(-DQT_NO_NARROWING_CONVERSIONS_IN_CONNECT)
 add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x060000)
 add_definitions(-DQT_NO_URL_CAST_FROM_STRING)
 add_subdirectory(src)
 
 if(BUILD_TESTING)
     add_subdirectory(autotests)
     add_subdirectory(tests)
 endif()
 
 ########### CMake Config Files ###########
 set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KF5Contacts")
 
 configure_package_config_file(
   "${CMAKE_CURRENT_SOURCE_DIR}/KF5ContactsConfig.cmake.in"
   "${CMAKE_CURRENT_BINARY_DIR}/KF5ContactsConfig.cmake"
   INSTALL_DESTINATION  ${CMAKECONFIG_INSTALL_DIR}
 )
 
 install(FILES
   "${CMAKE_CURRENT_BINARY_DIR}/KF5ContactsConfig.cmake"
   "${CMAKE_CURRENT_BINARY_DIR}/KF5ContactsConfigVersion.cmake"
   DESTINATION "${CMAKECONFIG_INSTALL_DIR}"
   COMPONENT Devel
 )
 
 install(EXPORT KF5ContactsTargets DESTINATION "${CMAKECONFIG_INSTALL_DIR}" FILE KF5ContactsTargets.cmake NAMESPACE KF5::)
 
 install(FILES
    ${CMAKE_CURRENT_BINARY_DIR}/kcontacts_version.h
   DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5} COMPONENT Devel
 )
 
 install( FILES kcontacts.renamecategories kcontacts.categories DESTINATION ${KDE_INSTALL_CONFDIR} )
 
 feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 819e7feb..e1a20942 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,134 +1,133 @@
 set(vcardparser_SRCS
   vcardparser/vcard.cpp
   vcardparser/vcardline.cpp
   vcardparser/vcardparser.cpp
 )
 
 set(kcontacts_SRCS
   address.cpp
   addressee.cpp
   addresseehelper.cpp
   addresseelist.cpp
   calendarurl.cpp
   contactgroup.cpp
   contactgrouptool.cpp
   email.cpp
   field.cpp
   geo.cpp
   gender.cpp
   impp.cpp
   key.cpp
   lang.cpp
   ldapdn.cpp
   ldif.cpp
   phonenumber.cpp
   picture.cpp
   related.cpp
   resourcelocatorurl.cpp
   secrecy.cpp
   sortmode.cpp
   sound.cpp
   timezone.cpp
   vcarddrag.cpp
   vcardtool.cpp
   fieldgroup.cpp
   title.cpp
   nickname.cpp
   role.cpp
   note.cpp
   org.cpp
   clientpidmap.cpp
   ${vcardparser_SRCS}
 )
 
 set(kcontacts_converter_SRCS
   converter/vcardconverter.cpp
   converter/ldifconverter.cpp
 )
 
 ecm_qt_declare_logging_category(kcontacts_converter_SRCS HEADER kcontacts_debug.h IDENTIFIER KCONTACTS_LOG CATEGORY_NAME org.kde.pim.kcontacts)
 
 add_library(KF5Contacts ${kcontacts_SRCS} ${kcontacts_converter_SRCS})
 
 generate_export_header(KF5Contacts BASE_NAME kcontacts)
 
 add_library(KF5::Contacts ALIAS KF5Contacts)
 
 target_include_directories(KF5Contacts INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF5}/KContacts>")
 target_include_directories(KF5Contacts PUBLIC "$<BUILD_INTERFACE:${KContacts_SOURCE_DIR}/src;${KContacts_BINARY_DIR}/src>")
 target_include_directories(KF5Contacts PUBLIC "$<BUILD_INTERFACE:${KContacts_SOURCE_DIR}/src/vcardparser>")
 
 target_link_libraries(KF5Contacts
 PUBLIC
     KF5::CoreAddons
 PRIVATE
     Qt5::Gui
-    Qt5::DBus
     KF5::ConfigCore
     KF5::I18n
     KF5::Codecs # for the vcard parser
 )
 
 set_target_properties(KF5Contacts PROPERTIES
     VERSION ${KContacts_VERSION_STRING}
     SOVERSION ${KContacts_SOVERSION}
     EXPORT_NAME Contacts
 )
 
 install(TARGETS KF5Contacts EXPORT KF5ContactsTargets ${KF5_INSTALL_TARGETS_DEFAULT_ARGS})
 
 ecm_generate_headers(KContacts_CamelCase_HEADERS
   HEADER_NAMES
   Address
   Addressee
   AddresseeList
   CalendarUrl
   ContactGroup
   ContactGroupTool
   Email
   Field
   Geo
   Gender
   Key
   Lang
   Impp
   PhoneNumber
   Picture
   Related
   ResourceLocatorUrl
   Secrecy
   SortMode
   Sound
   TimeZone
   Title
   Role
   Note
   Org
   NickName
   VCardDrag
   FieldGroup
   ClientPidMap
   PREFIX KContacts
   REQUIRED_HEADERS KContacts_HEADERS
 )
 
 add_subdirectory(converter)
 
 install(FILES
     ${CMAKE_CURRENT_BINARY_DIR}/kcontacts_export.h
     ${KContacts_HEADERS}
     DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5}/KContacts/kcontacts
     COMPONENT Devel
 )
 
 install(FILES
     ${KContacts_CamelCase_HEADERS}
     DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5}/KContacts/KContacts
     COMPONENT Devel
 )
 
 
 install(FILES countrytransl.map DESTINATION ${KDE_INSTALL_DATADIR_KF5}/kcontacts)
 
 ecm_generate_pri_file(BASE_NAME KContacts LIB_NAME KF5Contacts DEPS "CoreAddons" FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR ${KDE_INSTALL_INCLUDEDIR_KF5}/KContacts)
 install(FILES ${PRI_FILENAME} DESTINATION ${ECM_MKSPECS_INSTALL_DIR})