diff --git a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -39,10 +39,10 @@
               IconThemes
               People)
 
-set(REQUIRED_TPQT_VERSION 0.9.5)
+set(REQUIRED_TPQT_VERSION 0.9.8)
 
-find_package (TelepathyQt5 ${REQUIRED_TPQT_VERSION} REQUIRED)
-find_package (TelepathyQt5Service ${REQUIRED_TPQT_VERSION} REQUIRED) #used for the otr-proxy
+find_package (TelepathyQt5 ${REQUIRED_TPQT_VERSION} COMPONENTS Core REQUIRED)
+find_package (TelepathyQt5 ${REQUIRED_TPQT_VERSION} COMPONENTS Service) #used for the otr-proxy
 find_package (TelepathyLoggerQt)
 
 find_package (KAccounts)
@@ -52,7 +52,7 @@
 find_package (Libgcrypt)
 find_package (telepathy-accounts-signon)
 
-if (LIBOTR_FOUND AND LIBGCRYPT_FOUND)
+if (LIBOTR_FOUND AND LIBGCRYPT_FOUND AND TARGET TelepathyQt5::Service)
     set(OTR_LIBS_FOUND TRUE)
 endif ()
 
diff --git a/KTp/CMakeLists.txt b/KTp/CMakeLists.txt
--- a/KTp/CMakeLists.txt
+++ b/KTp/CMakeLists.txt
@@ -94,16 +94,15 @@
                     Qt5::DBus
                     Qt5::Xml
                     KF5::Wallet #included from wallet-interface.h
-                    ${TELEPATHY_QT5_LIBRARIES}
+                    TelepathyQt5::Core
                 PRIVATE
                     ${ktp_private_LIBS}
                     KF5::KIOWidgets
                     KF5::I18n
                     KF5::IconThemes
                     KF5::Notifications
                     KF5::IconThemes
 )
-target_include_directories(KTpCommonInternals PUBLIC ${TELEPATHY_QT5_INCLUDE_DIR}) # TODO: Remove when TelepathyQt exports include paths properly
 
 install (TARGETS KTpCommonInternals
          EXPORT KTpTargets
diff --git a/KTp/OTR/CMakeLists.txt b/KTp/OTR/CMakeLists.txt
--- a/KTp/OTR/CMakeLists.txt
+++ b/KTp/OTR/CMakeLists.txt
@@ -29,11 +29,10 @@
 target_link_libraries (KTpOTR
                         PUBLIC
                             Qt5::DBus
-                            ${TELEPATHY_QT5_LIBRARIES}
+                            TelepathyQt5::Core
                         PRIVATE
                             KF5::I18n
 )
-target_include_directories(KTpOTR PUBLIC ${TELEPATHY_QT5_INCLUDE_DIR}) # TODO: Remove when TelepathyQt exports include paths properly
 
 install (TARGETS KTpOTR
          EXPORT KTpTargets
diff --git a/otr-proxy/KTpProxy/CMakeLists.txt b/otr-proxy/KTpProxy/CMakeLists.txt
--- a/otr-proxy/KTpProxy/CMakeLists.txt
+++ b/otr-proxy/KTpProxy/CMakeLists.txt
@@ -22,7 +22,7 @@
 set(ktp-proxy_LIBS
         ${LIBOTR_LIBRARY}
         ${LIBGCRYPT_LIBRARIES}
-        ${TELEPATHY_QT5_SERVICE_LIBRARIES}
+        TelepathyQt5::Service
         KTp::CommonInternals
         KTp::OTR
         KF5::ConfigGui