diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2509f60c..c080cadd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,81 +1,81 @@
 cmake_minimum_required(VERSION 3.0)
 
 project(plasma-browser-integration)
 set(PROJECT_VERSION "5.12.80")
 set(PROJECT_VERSION_MAJOR 5)
 
 set(QT_MIN_VERSION "5.9.0")
 set(KF5_MIN_VERSION "5.42.0")
 
 find_package(ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE)
 set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
 
 include(KDEInstallDirs)
 include(KDECMakeSettings)
 include(KDECompilerSettings NO_POLICY_SCOPE)
 include(FeatureSummary)
 
 find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS
 Gui
 DBus
 Widgets
 )
 
 find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
     KIO
     I18n
     Notifications
     Runner
     WindowSystem
     Activities
 )
 
 # Options
 option(INSTALL_CHROME_EXTENSION "Whether to install the Chrome extension locally instead of downloading it from the Extension Store")
 option(INSTALL_CHROME_MANIFEST "Whether to install the a configuration file that mkaes chrome automatically download the extension from the store" TRUE)
 
 add_subdirectory(host)
 add_subdirectory(tabsrunner)
 
 if(NOT DEFINED CHROME_EXTENSION_ID)
     # The extension ID is based on the key used to sign the extension
     # see https://stackoverflow.com/questions/23873623/obtaining-chrome-extension-id-for-development
     set(CHROME_EXTENSION_ID "cimiefiiaegbelhefglklhhakcgmhkai")
 endif()
 
 # TODO configure manifest.json
 
 configure_file(org.kde.plasma.chrome_integration.json.in org.kde.plasma.chrome_integration.json @ONLY)
 configure_file(org.kde.plasma.firefox_integration.json.in org.kde.plasma.firefox_integration.json @ONLY)
 
 # #chromium
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.kde.plasma.chrome_integration.json DESTINATION ${KDE_INSTALL_FULL_SYSCONFDIR}/chromium/native-messaging-hosts/ RENAME org.kde.plasma.browser_integration.json)
 # #google-chrome
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.kde.plasma.chrome_integration.json DESTINATION ${KDE_INSTALL_FULL_SYSCONFDIR}/opt/chrome/native-messaging-hosts/ RENAME org.kde.plasma.browser_integration.json)
 # firefox
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.kde.plasma.firefox_integration.json DESTINATION ${KDE_INSTALL_DATADIR}/mozilla/native-messaging-hosts/ RENAME org.kde.plasma.browser_integration.json)
 
 if(INSTALL_CHROME_EXTENSION)
     configure_file(chrome_install_locally_policy.in chrome_install_locally_policy @ONLY)
 
     # google-chrome
     install(FILES ${CMAKE_CURRENT_BINARY_DIR}/chrome_install_locally_policy DESTINATION ${KDE_INSTALL_DATADIR}/google-chrome/extensions RENAME ${CHROME_EXTENSION_ID}.json)
     # chromium
     install(FILES ${CMAKE_CURRENT_BINARY_DIR}/chrome_install_locally_policy DESTINATION ${KDE_INSTALL_DATADIR}/chromium-browser/extensions RENAME ${CHROME_EXTENSION_ID}.json)
 
     # The actual extension file
     # TODO would be nice if we could automate the packaging and generation of the crx
     # TODO do we need to use some form of KDE_INSTALL_TARGETS_DEFAULT_ARGS?
-    install(FILES extension.crx DESTINATION ${CMAKE_INSTALL_PREFIX}/share/plasma-browser-integration)
+    install(FILES extension.crx DESTINATION ${KDE_INSTALL_DATADIR}/plasma-browser-integration)
 
 elseif (INSTALL_CHROME_MANIFEST) # Install a policy to have browsers automatically add the extension
 
     # google-chrome
     install(FILES chrome_install_from_store_policy DESTINATION ${KDE_INSTALL_DATADIR}/google-chrome/extensions RENAME ${CHROME_EXTENSION_ID}.json)
     # chromium
     install(FILES chrome_install_from_store_policy DESTINATION ${KDE_INSTALL_DATADIR}/chromium-browser/extensions RENAME ${CHROME_EXTENSION_ID}.json)
 endif()
 
 # TODO firefox
 
 feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES)
diff --git a/chrome_install_locally_policy.in b/chrome_install_locally_policy.in
index 06e22dc6..bc0cbe7b 100644
--- a/chrome_install_locally_policy.in
+++ b/chrome_install_locally_policy.in
@@ -1,4 +1,4 @@
 {
-    "external_crx": "@CMAKE_INSTALL_PREFIX@/share/plasma-browser-integration/extension.crx",
+    "external_crx": "@KDE_INSTALL_FULL_DATADIR@/plasma-browser-integration/extension.crx",
     "external_version": "@PROJECT_VERSION@"
 }
diff --git a/org.kde.plasma.chrome_integration.json.in b/org.kde.plasma.chrome_integration.json.in
index ab7a5842..7da06d78 100644
--- a/org.kde.plasma.chrome_integration.json.in
+++ b/org.kde.plasma.chrome_integration.json.in
@@ -1,9 +1,9 @@
 {
   "name": "org.kde.plasma.browser_integration",
   "description": "Native connector for KDE Plasma",
-  "path": "@CMAKE_INSTALL_PREFIX@/bin/plasma-browser-integration-host",
+  "path": "@KDE_INSTALL_FULL_BINDIR@/plasma-browser-integration-host",
   "type": "stdio",
   "allowed_origins": [
     "chrome-extension://@CHROME_EXTENSION_ID@/"
   ]
 }
diff --git a/org.kde.plasma.firefox_integration.json.in b/org.kde.plasma.firefox_integration.json.in
index abae3bd5..0a3f375b 100644
--- a/org.kde.plasma.firefox_integration.json.in
+++ b/org.kde.plasma.firefox_integration.json.in
@@ -1,7 +1,7 @@
 {
   "name": "org.kde.plasma.browser_integration",
   "description": "Native connector for KDE Plasma",
-  "path": "@CMAKE_INSTALL_PREFIX@/bin/plasma-browser-integration-host",
+  "path": "@KDE_INSTALL_FULL_BINDIR@/plasma-browser-integration-host",
   "type": "stdio",
   "allowed_extensions": ["plasma-browser-integration@kde.org"]
 }