diff --git a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -35,7 +35,6 @@
 ########### Find packages ###########
 find_package(KF5Codecs ${KF5_MIN_VERSION} CONFIG REQUIRED)
 find_package(KF5ConfigWidgets ${KF5_MIN_VERSION} CONFIG REQUIRED)
-find_package(KF5DBusAddons ${KF5_MIN_VERSION} CONFIG REQUIRED)
 find_package(KF5KIO ${KF5_MIN_VERSION} CONFIG REQUIRED)
 find_package(KF5I18n ${KF5_MIN_VERSION} CONFIG REQUIRED)
 find_package(KF5XmlGui ${KF5_MIN_VERSION} CONFIG REQUIRED)
diff --git a/autotests/benchmarker/CMakeLists.txt b/autotests/benchmarker/CMakeLists.txt
--- a/autotests/benchmarker/CMakeLists.txt
+++ b/autotests/benchmarker/CMakeLists.txt
@@ -24,9 +24,9 @@
   KF5::Mime
   Qt5::Test
   KF5::AkonadiCore
-  KF5::DBusAddons
   KF5::I18n
   Qt5::Widgets
+  Qt5::DBus
 )
 
 install(TARGETS akonadi_benchmarker ${KF5_INSTALL_TARGETS_DEFAULT_ARGS})
diff --git a/autotests/benchmarker/maketest.cpp b/autotests/benchmarker/maketest.cpp
--- a/autotests/benchmarker/maketest.cpp
+++ b/autotests/benchmarker/maketest.cpp
@@ -20,15 +20,14 @@
 
 #include "test.h"
 
-#include "KDBusConnectionPool"
-
 #include <agentinstancecreatejob.h>
 #include <collectiondeletejob.h>
 #include <collectionfetchjob.h>
 #include <collectionfetchscope.h>
 
 #include <QDebug>
 #include <QTest>
+#include <QDBusConnection>
 #include <QDBusInterface>
 
 using namespace Akonadi;
@@ -62,7 +61,7 @@
 void MakeTest::configureDBusIface(const QString &name, const QString &dir)
 {
     QDBusInterface *configIface = new QDBusInterface(QLatin1String("org.freedesktop.Akonadi.Resource.") + currentInstance.identifier(),
-                                                     QStringLiteral("/Settings"), QLatin1String("org.kde.Akonadi.") + name + QLatin1String(".Settings"), KDBusConnectionPool::threadConnection(), this);
+                                                     QStringLiteral("/Settings"), QLatin1String("org.kde.Akonadi.") + name + QLatin1String(".Settings"), QDBusConnection::sessionBus(), this);
 
     configIface->call(QStringLiteral("setPath"), dir);
     configIface->call(QStringLiteral("setReadOnly"), true);
diff --git a/autotests/localfolderstest.cpp b/autotests/localfolderstest.cpp
--- a/autotests/localfolderstest.cpp
+++ b/autotests/localfolderstest.cpp
@@ -20,9 +20,9 @@
 #include "localfolderstest.h"
 
 #include "collectionpathresolver.h"
-#include "kdbusconnectionpool.h"
 #include "specialmailcollectionssettings.h"
 
+#include <QDBusConnection>
 #include <QDBusConnectionInterface>
 #include <QFile>
 #include <QSignalSpy>
@@ -91,13 +91,13 @@
     }
 
     // Initially not locked.
-    QVERIFY(!KDBusConnectionPool::threadConnection().interface()->isServiceRegistered(dbusName));
+    QVERIFY(!QDBusConnection::sessionBus().interface()->isServiceRegistered(dbusName));
 
     // Get the lock.
     {
         GetLockJob *ljob = new GetLockJob(this);
         AKVERIFYEXEC(ljob);
-        QVERIFY(KDBusConnectionPool::threadConnection().interface()->isServiceRegistered(dbusName));
+        QVERIFY(QDBusConnection::sessionBus().interface()->isServiceRegistered(dbusName));
     }
 
     // Getting the lock again should fail.
@@ -107,9 +107,9 @@
     }
 
     // Release the lock.
-    QVERIFY(KDBusConnectionPool::threadConnection().interface()->isServiceRegistered(dbusName));
+    QVERIFY(QDBusConnection::sessionBus().interface()->isServiceRegistered(dbusName));
     releaseLock();
-    QVERIFY(!KDBusConnectionPool::threadConnection().interface()->isServiceRegistered(dbusName));
+    QVERIFY(!QDBusConnection::sessionBus().interface()->isServiceRegistered(dbusName));
 }
 
 void LocalFoldersTest::testInitialState()
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -81,7 +81,6 @@
     KF5::Mime
     KF5::AkonadiWidgets
     KF5::KIOCore
-    KF5::DBusAddons
     KF5::I18n
     KF5::ConfigWidgets
     KF5::XmlGui
diff --git a/src/util.cpp b/src/util.cpp
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -21,7 +21,7 @@
 #include "imapsettings.h"
 
 #include <servermanager.h>
-#include <KDBusConnectionPool>
+#include <QDBusConnection>
 
 #include <assert.h>
 #include "akonadi_mime_debug.h"
@@ -48,6 +48,6 @@
     //NOTE(Andras): from kmail/util.cpp
     return new OrgKdeAkonadiImapSettingsInterface(Akonadi::ServerManager::agentServiceName(Akonadi::ServerManager::Resource, ident),
                                                   QStringLiteral("/Settings"),
-                                                  KDBusConnectionPool::threadConnection());
+                                                  QDBusConnection::sessionBus());
 }
 }