diff --git a/autotests/libs/CMakeLists.txt b/autotests/libs/CMakeLists.txt
--- a/autotests/libs/CMakeLists.txt
+++ b/autotests/libs/CMakeLists.txt
@@ -28,7 +28,7 @@
   get_filename_component(_name ${_source} NAME_WE)
   ecm_add_test(TEST_NAME ${_name} ${_test})
   set_tests_properties(${_name} PROPERTIES ENVIRONMENT "QT_HASH_SEED=1;QT_NO_CPU_FEATURE=sse4.2")
-  target_link_libraries(${_name} akonaditestfake Qt5::Test KF5::AkonadiPrivate KF5::DBusAddons KF5::I18n)
+  target_link_libraries(${_name} akonaditestfake Qt5::Test KF5::AkonadiPrivate KF5::I18n)
 endmacro()
 
 # convenience macro to add akonadi qtestlib unit-tests
@@ -41,7 +41,7 @@
   get_filename_component(_name ${_source} NAME_WE)
   ecm_add_test(TEST_NAME ${_name} ${_test})
   set_tests_properties(${_name} PROPERTIES ENVIRONMENT "QT_HASH_SEED=1;QT_NO_CPU_FEATURE=sse4.2")
-  target_link_libraries(${_name} akonaditestfake Qt5::Test KF5::AkonadiWidgets KF5::AkonadiPrivate KF5::DBusAddons)
+  target_link_libraries(${_name} akonaditestfake Qt5::Test KF5::AkonadiWidgets KF5::AkonadiPrivate)
 endmacro()
 
 
@@ -72,7 +72,6 @@
         Qt5::Test
         Qt5::Widgets
         Qt5::Network
-        KF5::DBusAddons
         KF5::AkonadiPrivate
         akonadi_shared
 )
@@ -82,7 +81,7 @@
     firstrunner.cpp
     ${CMAKE_BINARY_DIR}/src/core/akonadicore_debug.cpp
 )
-target_link_libraries( akonadi-firstrun  Qt5::Test Qt5::Core KF5::AkonadiCore KF5::AkonadiPrivate KF5::DBusAddons KF5::ConfigCore Qt5::Widgets)
+target_link_libraries( akonadi-firstrun  Qt5::Test Qt5::Core KF5::AkonadiCore KF5::AkonadiPrivate KF5::ConfigCore Qt5::Widgets)
 
 # qtestlib unit tests
 add_akonadi_test(imapparsertest.cpp)
diff --git a/autotests/libs/test_utils.h b/autotests/libs/test_utils.h
--- a/autotests/libs/test_utils.h
+++ b/autotests/libs/test_utils.h
@@ -21,14 +21,13 @@
 #define AKONADI_TEST_UTILS_H
 
 #include "collectionpathresolver.h"
-#include "kdbusconnectionpool.h"
 #include "servermanager.h"
 #include "qtest_akonadi.h"
 #include "monitor.h"
 #include "collectionfetchscope.h"
 #include "itemfetchscope.h"
 
-
+#include <QDBusConnection>
 #include <QDBusInterface>
 #include <QDBusReply>
 
@@ -56,7 +55,7 @@
     QDBusInterface testrunnerIface(testrunnerServiceName(),
                                    QStringLiteral("/"),
                                    QStringLiteral("org.kde.Akonadi.Testrunner"),
-                                   KDBusConnectionPool::threadConnection());
+                                   QDBusConnection::sessionBus());
     if (!testrunnerIface.isValid()) {
         qWarning() << "Unable to get a dbus interface to the testrunner!";
     }
@@ -83,7 +82,7 @@
     QDBusInterface testrunnerIface(testrunnerServiceName(),
                                    QStringLiteral("/"),
                                    QStringLiteral("org.kde.Akonadi.Testrunner"),
-                                   KDBusConnectionPool::threadConnection());
+                                   QDBusConnection::sessionBus());
     if (!testrunnerIface.isValid()) {
         qWarning() << "Unable to get a dbus interface to the testrunner!";
     }
diff --git a/autotests/libs/testenvironmenttest.cpp b/autotests/libs/testenvironmenttest.cpp
--- a/autotests/libs/testenvironmenttest.cpp
+++ b/autotests/libs/testenvironmenttest.cpp
@@ -17,8 +17,6 @@
     02110-1301, USA.
 */
 
-#include "KDBusConnectionPool"
-
 #include <qtest_akonadi.h>
 #include <servermanager.h>
 
@@ -43,7 +41,7 @@
 
     void testDBus()
     {
-        QVERIFY(KDBusConnectionPool::threadConnection().isConnected());
+        QVERIFY(QDBusConnection::sessionBus().isConnected());
     }
 
     void testAkonadiServer()
@@ -53,11 +51,11 @@
 
     void testResources()
     {
-        QVERIFY(KDBusConnectionPool::threadConnection().interface()->isServiceRegistered(
+        QVERIFY(QDBusConnection::sessionBus().interface()->isServiceRegistered(
                     ServerManager::agentServiceName(ServerManager::Resource, QStringLiteral("akonadi_knut_resource_0"))));
-        QVERIFY(KDBusConnectionPool::threadConnection().interface()->isServiceRegistered(
+        QVERIFY(QDBusConnection::sessionBus().interface()->isServiceRegistered(
                     ServerManager::agentServiceName(ServerManager::Resource, QStringLiteral("akonadi_knut_resource_1"))));
-        QVERIFY(KDBusConnectionPool::threadConnection().interface()->isServiceRegistered(
+        QVERIFY(QDBusConnection::sessionBus().interface()->isServiceRegistered(
                     ServerManager::agentServiceName(ServerManager::Resource, QStringLiteral("akonadi_knut_resource_2"))));
     }
 };
diff --git a/autotests/libs/testresource/CMakeLists.txt b/autotests/libs/testresource/CMakeLists.txt
--- a/autotests/libs/testresource/CMakeLists.txt
+++ b/autotests/libs/testresource/CMakeLists.txt
@@ -33,7 +33,6 @@
   KF5::AkonadiCore
   KF5::KIOCore
   KF5::AkonadiAgentBase
-  KF5::DBusAddons
   Qt5::Xml
   KF5::I18n
 )
diff --git a/autotests/libs/testresource/knutresource.cpp b/autotests/libs/testresource/knutresource.cpp
--- a/autotests/libs/testresource/knutresource.cpp
+++ b/autotests/libs/testresource/knutresource.cpp
@@ -29,7 +29,7 @@
 #include <agentfactory.h>
 #include <changerecorder.h>
 #include <collection.h>
-#include <KDBusConnectionPool>
+#include <QDBusConnection>
 #include <item.h>
 #include <itemfetchscope.h>
 #include <tagcreatejob.h>
@@ -54,7 +54,7 @@
     changeRecorder()->fetchCollection(true);
 
     new SettingsAdaptor(mSettings);
-    KDBusConnectionPool::threadConnection().registerObject(QStringLiteral("/Settings"),
+    QDBusConnection::sessionBus().registerObject(QStringLiteral("/Settings"),
             mSettings, QDBusConnection::ExportAdaptors);
     connect(this, &KnutResource::reloadConfiguration, this, &KnutResource::load);
     connect(mWatcher, &QFileSystemWatcher::fileChanged, this, &KnutResource::load);
diff --git a/src/agentbase/CMakeLists.txt b/src/agentbase/CMakeLists.txt
--- a/src/agentbase/CMakeLists.txt
+++ b/src/agentbase/CMakeLists.txt
@@ -63,7 +63,6 @@
 PRIVATE
     KF5::AkonadiPrivate
     KF5::AkonadiWidgets
-    KF5::DBusAddons
     KF5::I18n
     Qt5::Network
     akonadi_shared
diff --git a/src/agentbase/agentbase.h b/src/agentbase/agentbase.h
--- a/src/agentbase/agentbase.h
+++ b/src/agentbase/agentbase.h
@@ -77,7 +77,7 @@
  * most notably AgentBase::config(). Additionally,
  * one cannot use QDBusConnection::sessionBus() with dbus < 1.4, because of a
  * multithreading bug in libdbus. Instead one should use
- * KDBusConnectionPool::threadConnection() which works around this problem.
+ * QDBusConnection::sessionBus() which works around this problem.
  *
  * @author Till Adam <adam@kde.org>, Volker Krause <vkrause@kde.org>
  */
diff --git a/src/agentbase/agentbase.cpp b/src/agentbase/agentbase.cpp
--- a/src/agentbase/agentbase.cpp
+++ b/src/agentbase/agentbase.cpp
@@ -28,7 +28,6 @@
 #include "agentmanager.h"
 #include "changerecorder.h"
 #include "controladaptor.h"
-#include "KDBusConnectionPool"
 #include "itemfetchjob.h"
 #include "monitor_p.h"
 #include "servermanager_p.h"
@@ -379,12 +378,12 @@
 
     mTracer = new org::freedesktop::Akonadi::Tracer(ServerManager::serviceName(ServerManager::Server),
             QStringLiteral("/tracing"),
-            KDBusConnectionPool::threadConnection(), q);
+            QDBusConnection::sessionBus(), q);
 
     new Akonadi__ControlAdaptor(q);
     new Akonadi__StatusAdaptor(q);
-    if (!KDBusConnectionPool::threadConnection().registerObject(QStringLiteral("/"), q, QDBusConnection::ExportAdaptors)) {
-        Q_EMIT q->error(i18n("Unable to register object at dbus: %1", KDBusConnectionPool::threadConnection().lastError().message()));
+    if (!QDBusConnection::sessionBus().registerObject(QStringLiteral("/"), q, QDBusConnection::ExportAdaptors)) {
+        Q_EMIT q->error(i18n("Unable to register object at dbus: %1", QDBusConnection::sessionBus().lastError().message()));
     }
 
     mSettings = new QSettings(ServerManager::agentConfigFilePath(mId), QSettings::IniFormat);
@@ -461,13 +460,13 @@
     Q_Q(AgentBase);
 
     const QString serviceId = ServerManager::agentServiceName(ServerManager::Agent, mId);
-    if (!KDBusConnectionPool::threadConnection().registerService(serviceId)) {
+    if (!QDBusConnection::sessionBus().registerService(serviceId)) {
         qCCritical(AKONADIAGENTBASE_LOG) << "Unable to register service" << serviceId << "at dbus:"
-                                         << KDBusConnectionPool::threadConnection().lastError().message();
+                                         << QDBusConnection::sessionBus().lastError().message();
     }
     q->setOnlineInternal(mDesiredOnlineState);
 
-    KDBusConnectionPool::threadConnection().registerObject(QStringLiteral("/Debug"), this, QDBusConnection::ExportScriptableSlots);
+    QDBusConnection::sessionBus().registerObject(QStringLiteral("/Debug"), this, QDBusConnection::ExportScriptableSlots);
 }
 
 void AgentBasePrivate::setProgramName()
@@ -1112,7 +1111,7 @@
 
 WId AgentBase::winIdForDialogs() const
 {
-    const bool registered = KDBusConnectionPool::threadConnection().interface()->isServiceRegistered(QStringLiteral("org.freedesktop.akonaditray"));
+    const bool registered = QDBusConnection::sessionBus().interface()->isServiceRegistered(QStringLiteral("org.freedesktop.akonaditray"));
     if (!registered) {
         return 0;
     }
diff --git a/src/agentbase/agentsearchinterface.cpp b/src/agentbase/agentsearchinterface.cpp
--- a/src/agentbase/agentsearchinterface.cpp
+++ b/src/agentbase/agentsearchinterface.cpp
@@ -21,7 +21,7 @@
 #include "akonadiagentbase_debug.h"
 #include "agentsearchinterface_p.h"
 #include "collection.h"
-#include "KDBusConnectionPool"
+#include <QDBusConnection>
 #include "searchresultjob_p.h"
 #include "searchadaptor.h"
 #include "collectionfetchjob.h"
@@ -36,7 +36,7 @@
     : q(qq)
 {
     new Akonadi__SearchAdaptor(this);
-    KDBusConnectionPool::threadConnection().registerObject(QStringLiteral("/Search"),
+    QDBusConnection::sessionBus().registerObject(QStringLiteral("/Search"),
             this, QDBusConnection::ExportAdaptors);
 
     QTimer::singleShot(0, this, &AgentSearchInterfacePrivate::delayedInit);
diff --git a/src/agentbase/preprocessorbase_p.cpp b/src/agentbase/preprocessorbase_p.cpp
--- a/src/agentbase/preprocessorbase_p.cpp
+++ b/src/agentbase/preprocessorbase_p.cpp
@@ -20,7 +20,7 @@
 #include "preprocessorbase_p.h"
 #include "preprocessorbase.h"
 
-#include "KDBusConnectionPool"
+#include <QDBusConnection>
 #include "preprocessoradaptor.h"
 #include "servermanager.h"
 
@@ -38,17 +38,17 @@
 
     new Akonadi__PreprocessorAdaptor(this);
 
-    if (!KDBusConnectionPool::threadConnection().registerObject(QStringLiteral("/Preprocessor"), this, QDBusConnection::ExportAdaptors)) {
-        Q_EMIT q->error(i18n("Unable to register object at dbus: %1", KDBusConnectionPool::threadConnection().lastError().message()));
+    if (!QDBusConnection::sessionBus().registerObject(QStringLiteral("/Preprocessor"), this, QDBusConnection::ExportAdaptors)) {
+        Q_EMIT q->error(i18n("Unable to register object at dbus: %1", QDBusConnection::sessionBus().lastError().message()));
     }
 
 }
 
 void PreprocessorBasePrivate::delayedInit()
 {
-    if (!KDBusConnectionPool::threadConnection().registerService(ServerManager::agentServiceName(ServerManager::Preprocessor, mId))) {
+    if (!QDBusConnection::sessionBus().registerService(ServerManager::agentServiceName(ServerManager::Preprocessor, mId))) {
         qCCritical(AKONADIAGENTBASE_LOG) << "Unable to register service at D-Bus: "
-                                         << KDBusConnectionPool::threadConnection().lastError().message();
+                                         << QDBusConnection::sessionBus().lastError().message();
     }
     AgentBasePrivate::delayedInit();
 }
diff --git a/src/agentbase/resourcebase.cpp b/src/agentbase/resourcebase.cpp
--- a/src/agentbase/resourcebase.cpp
+++ b/src/agentbase/resourcebase.cpp
@@ -25,7 +25,7 @@
 #include "resourceadaptor.h"
 #include "collectiondeletejob.h"
 #include "collectionsync_p.h"
-#include "KDBusConnectionPool"
+#include <QDBusConnection>
 #include "itemsync.h"
 #include "akonadifull-version.h"
 #include "tagsync.h"
@@ -103,9 +103,9 @@
 
     void delayedInit() override {
         const QString serviceId = ServerManager::agentServiceName(ServerManager::Resource, mId);
-        if (!KDBusConnectionPool::threadConnection().registerService(serviceId))
+        if (!QDBusConnection::sessionBus().registerService(serviceId))
         {
-            QString reason = KDBusConnectionPool::threadConnection().lastError().message();
+            QString reason = QDBusConnection::sessionBus().lastError().message();
             if (reason.isEmpty()) {
                 reason = QStringLiteral("this service is probably running already.");
             }
diff --git a/src/agentbase/resourcescheduler.cpp b/src/agentbase/resourcescheduler.cpp
--- a/src/agentbase/resourcescheduler.cpp
+++ b/src/agentbase/resourcescheduler.cpp
@@ -19,7 +19,7 @@
 
 #include "resourcescheduler_p.h"
 
-#include "KDBusConnectionPool"
+#include <QDBusConnection>
 #include "recursivemover_p.h"
 
 #include "akonadiagentbase_debug.h"
@@ -528,11 +528,11 @@
     // if there's a job tracer running, tell it about the new job
     if (!s_resourcetracker) {
         const QString suffix = Akonadi::Instance::identifier().isEmpty() ? QString() : QLatin1Char('-') + Akonadi::Instance::identifier();
-        if (KDBusConnectionPool::threadConnection().interface()->isServiceRegistered(QStringLiteral("org.kde.akonadiconsole") + suffix)) {
+        if (QDBusConnection::sessionBus().interface()->isServiceRegistered(QStringLiteral("org.kde.akonadiconsole") + suffix)) {
             s_resourcetracker = new QDBusInterface(QLatin1String("org.kde.akonadiconsole") + suffix,
                                                    QStringLiteral("/resourcesJobtracker"),
                                                    QStringLiteral("org.freedesktop.Akonadi.JobTracker"),
-                                                   KDBusConnectionPool::threadConnection(), nullptr);
+                                                   QDBusConnection::sessionBus(), nullptr);
         }
     }
 
@@ -576,7 +576,7 @@
         } else {
             qCCritical(AKONADIAGENTBASE_LOG) << "Got unexpected member:" << methodName;
         }
-        KDBusConnectionPool::threadConnection().send(reply);
+        QDBusConnection::sessionBus().send(reply);
     }
 }
 
diff --git a/src/agentbase/transportresourcebase.cpp b/src/agentbase/transportresourcebase.cpp
--- a/src/agentbase/transportresourcebase.cpp
+++ b/src/agentbase/transportresourcebase.cpp
@@ -20,7 +20,7 @@
 #include "transportresourcebase.h"
 #include "transportresourcebase_p.h"
 
-#include "KDBusConnectionPool"
+#include <QDBusConnection>
 #include "transportadaptor.h"
 
 #include "itemfetchjob.h"
@@ -35,7 +35,7 @@
     , q(qq)
 {
     new Akonadi__TransportAdaptor(this);
-    KDBusConnectionPool::threadConnection().registerObject(QStringLiteral("/Transport"),
+    QDBusConnection::sessionBus().registerObject(QStringLiteral("/Transport"),
             this, QDBusConnection::ExportAdaptors);
 }
 
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -305,7 +305,6 @@
     Qt5::Network
     Qt5::Widgets
     KF5::AkonadiPrivate
-    KF5::DBusAddons
     KF5::I18n
     KF5::IconThemes
     KF5::ConfigCore
diff --git a/src/core/agentconfigurationmanager.cpp b/src/core/agentconfigurationmanager.cpp
--- a/src/core/agentconfigurationmanager.cpp
+++ b/src/core/agentconfigurationmanager.cpp
@@ -26,7 +26,7 @@
 #include <QPluginLoader>
 #include <QDir>
 
-#include <KDBusConnectionPool>
+#include <QDBusConnection>
 
 namespace Akonadi {
 class Q_DECL_HIDDEN AgentConfigurationManager::Private {
@@ -66,7 +66,7 @@
 bool AgentConfigurationManager::registerInstanceConfiguration(const QString &instance)
 {
     const auto serviceName = d->serviceName(instance);
-    QDBusConnection conn = KDBusConnectionPool::threadConnection();
+    QDBusConnection conn = QDBusConnection::sessionBus();
     if (conn.interface()->isServiceRegistered(serviceName)) {
         qCDebug(AKONADICORE_LOG) << "Service " << serviceName << " is already registered";
         return false;
@@ -78,13 +78,13 @@
 void AgentConfigurationManager::unregisterInstanceConfiguration(const QString &instance)
 {
     const auto serviceName = d->serviceName(instance);
-    KDBusConnectionPool::threadConnection().unregisterService(serviceName);
+    QDBusConnection::sessionBus().unregisterService(serviceName);
 }
 
 bool AgentConfigurationManager::isInstanceRegistered(const QString &instance) const
 {
     const auto serviceName = d->serviceName(instance);
-    return KDBusConnectionPool::threadConnection().interface()->isServiceRegistered(serviceName);
+    return QDBusConnection::sessionBus().interface()->isServiceRegistered(serviceName);
 }
 
 QString AgentConfigurationManager::findConfigPlugin(const QString &type) const
diff --git a/src/core/agentmanager.cpp b/src/core/agentmanager.cpp
--- a/src/core/agentmanager.cpp
+++ b/src/core/agentmanager.cpp
@@ -22,15 +22,14 @@
 
 #include "agenttype_p.h"
 #include "agentinstance_p.h"
-#include "KDBusConnectionPool"
+#include <QDBusConnection>
 #include "servermanager.h"
 #include "collection.h"
 
 #include "shared/akranges.h"
 
 #include <QDBusServiceWatcher>
 #include <QWidget>
-#include <kdbusconnectionpool.h>
 
 using namespace Akonadi;
 using namespace AkRanges;
@@ -318,7 +317,7 @@
 
     mManager = new org::freedesktop::Akonadi::AgentManager(ServerManager::serviceName(ServerManager::Control),
             QStringLiteral("/AgentManager"),
-            KDBusConnectionPool::threadConnection(), mParent);
+            QDBusConnection::sessionBus(), mParent);
 
     QObject::connect(mManager, SIGNAL(agentTypeAdded(QString)),
                      mParent, SLOT(agentTypeAdded(QString)));
@@ -360,7 +359,7 @@
     d->createDBusInterface();
 
     d->mServiceWatcher = std::make_unique<QDBusServiceWatcher>(
-            ServerManager::serviceName(ServerManager::Control), KDBusConnectionPool::threadConnection(),
+            ServerManager::serviceName(ServerManager::Control), QDBusConnection::sessionBus(),
             QDBusServiceWatcher::WatchForRegistration);
     connect(d->mServiceWatcher.get(), &QDBusServiceWatcher::serviceRegistered,
             this, [this]() {
diff --git a/src/core/firstrun.cpp b/src/core/firstrun.cpp
--- a/src/core/firstrun.cpp
+++ b/src/core/firstrun.cpp
@@ -18,7 +18,7 @@
 */
 
 #include "firstrun_p.h"
-#include "KDBusConnectionPool"
+#include <QDBusConnection>
 #include "servermanager.h"
 
 #include "agentinstance.h"
@@ -55,7 +55,7 @@
         deleteLater();
         return;
     }
-    if (KDBusConnectionPool::threadConnection().registerService(QLatin1String(FIRSTRUN_DBUSLOCK))) {
+    if (QDBusConnection::sessionBus().registerService(QLatin1String(FIRSTRUN_DBUSLOCK))) {
         findPendingDefaults();
         qCDebug(AKONADICORE_LOG) << "D-Bus lock acquired, pending defaults:" << mPendingDefaults;
         setupNext();
@@ -68,7 +68,7 @@
 Firstrun::~Firstrun()
 {
     if (qApp) {
-        KDBusConnectionPool::threadConnection().unregisterService(QLatin1String(FIRSTRUN_DBUSLOCK));
+        QDBusConnection::sessionBus().unregisterService(QLatin1String(FIRSTRUN_DBUSLOCK));
     }
     delete mConfig;
     qCDebug(AKONADICORE_LOG) << "done";
@@ -154,7 +154,7 @@
 
     const auto service = ServerManager::agentServiceName(ServerManager::Agent, instance.identifier());
     QDBusInterface *iface = new QDBusInterface(service, QStringLiteral("/Settings"), QString(),
-            KDBusConnectionPool::threadConnection(), this);
+            QDBusConnection::sessionBus(), this);
     if (!iface->isValid()) {
         qCCritical(AKONADICORE_LOG) << "Unable to obtain the KConfigXT D-Bus interface of " << instance.identifier();
         setupNext();
diff --git a/src/core/jobs/agentinstancecreatejob.cpp b/src/core/jobs/agentinstancecreatejob.cpp
--- a/src/core/jobs/agentinstancecreatejob.cpp
+++ b/src/core/jobs/agentinstancecreatejob.cpp
@@ -23,7 +23,7 @@
 #include "agentmanager.h"
 #include "agentmanager_p.h"
 #include "controlinterface.h"
-#include "KDBusConnectionPool"
+#include <QDBusConnection>
 #include "kjobprivatebase_p.h"
 #include "servermanager.h"
 
@@ -77,7 +77,7 @@
     {
         org::freedesktop::Akonadi::Agent::Control *agentControlIface =
             new org::freedesktop::Akonadi::Agent::Control(ServerManager::agentServiceName(ServerManager::Agent, agentInstance.identifier()),
-                    QStringLiteral("/"), KDBusConnectionPool::threadConnection(), q);
+                    QStringLiteral("/"), QDBusConnection::sessionBus(), q);
         if (!agentControlIface || !agentControlIface->isValid()) {
             delete agentControlIface;
 
diff --git a/src/core/jobs/collectionattributessynchronizationjob.cpp b/src/core/jobs/collectionattributessynchronizationjob.cpp
--- a/src/core/jobs/collectionattributessynchronizationjob.cpp
+++ b/src/core/jobs/collectionattributessynchronizationjob.cpp
@@ -16,7 +16,7 @@
  */
 
 #include "collectionattributessynchronizationjob.h"
-#include "KDBusConnectionPool"
+#include <QDBusConnection>
 #include "kjobprivatebase_p.h"
 #include "servermanager.h"
 #include "akonadicore_debug.h"
@@ -98,7 +98,7 @@
     interface = new QDBusInterface(ServerManager::agentServiceName(ServerManager::Resource, instance.identifier()),
                                    QStringLiteral("/"),
                                    QStringLiteral("org.freedesktop.Akonadi.Resource"),
-                                   KDBusConnectionPool::threadConnection(), this);
+                                   QDBusConnection::sessionBus(), this);
     connect(interface, SIGNAL(attributesSynchronized(qlonglong)), q, SLOT(slotSynchronized(qlonglong)));
 
     if (interface->isValid()) {
diff --git a/src/core/jobs/job.cpp b/src/core/jobs/job.cpp
--- a/src/core/jobs/job.cpp
+++ b/src/core/jobs/job.cpp
@@ -22,7 +22,7 @@
 #include "job.h"
 #include "job_p.h"
 #include "akonadicore_debug.h"
-#include "KDBusConnectionPool"
+#include <QDBusConnection>
 #include <QTime>
 #include "private/protocol_p.h"
 #include "private/instance_p.h"
@@ -121,11 +121,11 @@
                 s_lastTime.start();
             }
             const QString suffix  = Akonadi::Instance::identifier().isEmpty() ? QString() : QLatin1Char('-') + Akonadi::Instance::identifier();
-            if (KDBusConnectionPool::threadConnection().interface()->isServiceRegistered(QStringLiteral("org.kde.akonadiconsole") + suffix)) {
+            if (QDBusConnection::sessionBus().interface()->isServiceRegistered(QStringLiteral("org.kde.akonadiconsole") + suffix)) {
                 s_jobtracker = new QDBusInterface(QLatin1String("org.kde.akonadiconsole") + suffix,
                                                   QStringLiteral("/jobtracker"),
                                                   QStringLiteral("org.freedesktop.Akonadi.JobTracker"),
-                                                  KDBusConnectionPool::threadConnection(), nullptr);
+                                                  QDBusConnection::sessionBus(), nullptr);
                 mSession->d->publishOtherJobs(q);
             } else {
                 s_lastTime.restart();
diff --git a/src/core/jobs/resourcesynchronizationjob.cpp b/src/core/jobs/resourcesynchronizationjob.cpp
--- a/src/core/jobs/resourcesynchronizationjob.cpp
+++ b/src/core/jobs/resourcesynchronizationjob.cpp
@@ -16,7 +16,7 @@
  */
 
 #include "resourcesynchronizationjob.h"
-#include "KDBusConnectionPool"
+#include <QDBusConnection>
 #include "kjobprivatebase_p.h"
 #include "servermanager.h"
 #include "agentinstance.h"
@@ -106,7 +106,7 @@
     interface = new QDBusInterface(ServerManager::agentServiceName(ServerManager::Resource, instance.identifier()),
                                    QStringLiteral("/"),
                                    QStringLiteral("org.freedesktop.Akonadi.Resource"),
-                                   KDBusConnectionPool::threadConnection(), this);
+                                   QDBusConnection::sessionBus(), this);
     if (collectionTreeOnly) {
         connect(interface, SIGNAL(collectionTreeSynchronized()), q, SLOT(slotSynchronized()));
     } else {
diff --git a/src/core/jobs/specialcollectionshelperjobs.cpp b/src/core/jobs/specialcollectionshelperjobs.cpp
--- a/src/core/jobs/specialcollectionshelperjobs.cpp
+++ b/src/core/jobs/specialcollectionshelperjobs.cpp
@@ -19,7 +19,7 @@
 
 #include "specialcollectionshelperjobs_p.h"
 
-#include "KDBusConnectionPool"
+#include <QDBusConnection>
 #include "specialcollectionattribute.h"
 #include "specialcollections.h"
 #include "servermanager.h"
@@ -45,7 +45,6 @@
 #include <QMetaMethod>
 #include <QTime>
 #include <QTimer>
-#include <kdbusconnectionpool.h>
 
 #define LOCK_WAIT_TIMEOUT_SECONDS 30
 
@@ -580,19 +579,19 @@
     // Just doing registerService() and checking its return value is not sufficient,
     // since we may *already* own the name, and then registerService() returns true.
 
-    QDBusConnection bus = KDBusConnectionPool::threadConnection();
+    QDBusConnection bus = QDBusConnection::sessionBus();
     const bool alreadyLocked = bus.interface()->isServiceRegistered(dbusServiceName());
     const bool gotIt = bus.registerService(dbusServiceName());
 
     if (gotIt && !alreadyLocked) {
         //qCDebug(AKONADICORE_LOG) << "Got lock immediately.";
         q->emitResult();
     } else {
-        auto watcher = new QDBusServiceWatcher(dbusServiceName(), KDBusConnectionPool::threadConnection(),
+        auto watcher = new QDBusServiceWatcher(dbusServiceName(), QDBusConnection::sessionBus(),
                 QDBusServiceWatcher::WatchForUnregistration, q);
         connect(watcher, &QDBusServiceWatcher::serviceUnregistered,
                 q, [this]() {
-                    if (KDBusConnectionPool::threadConnection().registerService(dbusServiceName())) {
+                    if (QDBusConnection::sessionBus().registerService(dbusServiceName())) {
                         mSafetyTimer->stop();
                         q->emitResult();
                     }
@@ -650,7 +649,7 @@
 
 bool Akonadi::releaseLock()
 {
-    return KDBusConnectionPool::threadConnection().unregisterService(dbusServiceName());
+    return QDBusConnection::sessionBus().unregisterService(dbusServiceName());
 }
 
 #include "moc_specialcollectionshelperjobs_p.cpp"
diff --git a/src/core/servermanager.cpp b/src/core/servermanager.cpp
--- a/src/core/servermanager.cpp
+++ b/src/core/servermanager.cpp
@@ -22,7 +22,6 @@
 
 #include "agenttype.h"
 #include "agentmanager.h"
-#include "KDBusConnectionPool"
 #include "session_p.h"
 #include "firstrun_p.h"
 
@@ -44,7 +43,6 @@
 #include <QProcess>
 #include <QTimer>
 #include <QScopedPointer>
-#include <kdbusconnectionpool.h>
 #include <qnamespace.h>
 
 using namespace Akonadi;
@@ -131,7 +129,7 @@
     qRegisterMetaType<Akonadi::ServerManager::State>();
 
     d->serviceWatcher = std::make_unique<QDBusServiceWatcher>(
-            ServerManager::serviceName(ServerManager::Server), KDBusConnectionPool::threadConnection(),
+            ServerManager::serviceName(ServerManager::Server), QDBusConnection::sessionBus(),
             QDBusServiceWatcher::WatchForRegistration | QDBusServiceWatcher::WatchForUnregistration);
     d->serviceWatcher->addWatchedService(ServerManager::serviceName(ServerManager::Control));
     d->serviceWatcher->addWatchedService(ServerManager::serviceName(ServerManager::ControlLock));
@@ -176,13 +174,13 @@
 
 bool ServerManager::start()
 {
-    const bool controlRegistered = KDBusConnectionPool::threadConnection().interface()->isServiceRegistered(ServerManager::serviceName(ServerManager::Control));
-    const bool serverRegistered = KDBusConnectionPool::threadConnection().interface()->isServiceRegistered(ServerManager::serviceName(ServerManager::Server));
+    const bool controlRegistered = QDBusConnection::sessionBus().interface()->isServiceRegistered(ServerManager::serviceName(ServerManager::Control));
+    const bool serverRegistered = QDBusConnection::sessionBus().interface()->isServiceRegistered(ServerManager::serviceName(ServerManager::Server));
     if (controlRegistered && serverRegistered) {
         return true;
     }
 
-    const bool controlLockRegistered = KDBusConnectionPool::threadConnection().interface()->isServiceRegistered(ServerManager::serviceName(ServerManager::ControlLock));
+    const bool controlLockRegistered = QDBusConnection::sessionBus().interface()->isServiceRegistered(ServerManager::serviceName(ServerManager::ControlLock));
     if (controlLockRegistered || controlRegistered) {
         qCDebug(AKONADICORE_LOG) << "Akonadi server is already starting up";
         sInstance->setState(Starting);
@@ -197,7 +195,7 @@
     const bool ok = QProcess::startDetached(QStringLiteral("akonadi_control"), args);
     if (!ok) {
         qCWarning(AKONADICORE_LOG) << "Unable to execute akonadi_control, falling back to D-Bus auto-launch";
-        QDBusReply<void> reply = KDBusConnectionPool::threadConnection().interface()->startService(ServerManager::serviceName(ServerManager::Control));
+        QDBusReply<void> reply = QDBusConnection::sessionBus().interface()->startService(ServerManager::serviceName(ServerManager::Control));
         if (!reply.isValid()) {
             qCDebug(AKONADICORE_LOG) << "Akonadi server could not be started via D-Bus either: "
                                      << reply.error().message();
@@ -240,13 +238,13 @@
         sInstance->mBrokenReason.clear();
     }
 
-    const bool serverUpgrading = KDBusConnectionPool::threadConnection().interface()->isServiceRegistered(ServerManager::serviceName(ServerManager::UpgradeIndicator));
+    const bool serverUpgrading = QDBusConnection::sessionBus().interface()->isServiceRegistered(ServerManager::serviceName(ServerManager::UpgradeIndicator));
     if (serverUpgrading) {
         return Upgrading;
     }
 
-    const bool controlRegistered = KDBusConnectionPool::threadConnection().interface()->isServiceRegistered(ServerManager::serviceName(ServerManager::Control));
-    const bool serverRegistered = KDBusConnectionPool::threadConnection().interface()->isServiceRegistered(ServerManager::serviceName(ServerManager::Server));
+    const bool controlRegistered = QDBusConnection::sessionBus().interface()->isServiceRegistered(ServerManager::serviceName(ServerManager::Control));
+    const bool serverRegistered = QDBusConnection::sessionBus().interface()->isServiceRegistered(ServerManager::serviceName(ServerManager::Server));
     if (controlRegistered && serverRegistered) {
         // check if the server protocol is recent enough
         if (sInstance.exists()) {
@@ -277,7 +275,7 @@
         }
     }
 
-    const bool controlLockRegistered = KDBusConnectionPool::threadConnection().interface()->isServiceRegistered(ServerManager::serviceName(ServerManager::ControlLock));
+    const bool controlLockRegistered = QDBusConnection::sessionBus().interface()->isServiceRegistered(ServerManager::serviceName(ServerManager::ControlLock));
     if (controlLockRegistered || controlRegistered) {
         qCDebug(AKONADICORE_LOG) << "Akonadi server is only partially running. Server:" << serverRegistered << "ControlLock:" << controlLockRegistered << "Control:" << controlRegistered;
         if (previousState == Running) {
diff --git a/src/selftest/CMakeLists.txt b/src/selftest/CMakeLists.txt
--- a/src/selftest/CMakeLists.txt
+++ b/src/selftest/CMakeLists.txt
@@ -8,7 +8,6 @@
 PRIVATE
     KF5::AkonadiWidgets
     KF5::AkonadiPrivate
-    KF5::DBusAddons
     KF5::I18n
     Qt5::Sql
     Qt5::Widgets
diff --git a/src/widgets/CMakeLists.txt b/src/widgets/CMakeLists.txt
--- a/src/widgets/CMakeLists.txt
+++ b/src/widgets/CMakeLists.txt
@@ -103,7 +103,6 @@
     KF5::IconThemes
     KF5::XmlGui
     KF5::ItemViews
-    KF5::DBusAddons
     Qt5::Sql
     KF5::AkonadiPrivate
     KF5::WindowSystem
diff --git a/src/widgets/selftestdialog.cpp b/src/widgets/selftestdialog.cpp
--- a/src/widgets/selftestdialog.cpp
+++ b/src/widgets/selftestdialog.cpp
@@ -19,7 +19,6 @@
 
 #include "selftestdialog.h"
 #include "agentmanager.h"
-#include "KDBusConnectionPool"
 #include "servermanager.h"
 #include "servermanager_p.h"
 #include "private/standarddirs_p.h"
@@ -415,16 +414,16 @@
 
 void SelfTestDialog::testServerStatus()
 {
-    if (KDBusConnectionPool::threadConnection().interface()->isServiceRegistered(ServerManager::serviceName(ServerManager::Control))) {
+    if (QDBusConnection::sessionBus().interface()->isServiceRegistered(ServerManager::serviceName(ServerManager::Control))) {
         report(Success, ki18n("Akonadi control process registered at D-Bus."),
                ki18n("The Akonadi control process is registered at D-Bus which typically indicates it is operational."));
     } else {
         report(Error, ki18n("Akonadi control process not registered at D-Bus."),
                ki18n("The Akonadi control process is not registered at D-Bus which typically means it was not started "
                      "or encountered a fatal error during startup."));
     }
 
-    if (KDBusConnectionPool::threadConnection().interface()->isServiceRegistered(ServerManager::serviceName(ServerManager::Server))) {
+    if (QDBusConnection::sessionBus().interface()->isServiceRegistered(ServerManager::serviceName(ServerManager::Server))) {
         report(Success, ki18n("Akonadi server process registered at D-Bus."),
                ki18n("The Akonadi server process is registered at D-Bus which typically indicates it is operational."));
     } else {