diff --git a/src/lib/CMakeLists.txt b/src/lib/CMakeLists.txt
index 9aaf488..650f046 100644
--- a/src/lib/CMakeLists.txt
+++ b/src/lib/CMakeLists.txt
@@ -1,77 +1,77 @@
 project (kaccounts-support-library)
 
 include_directories(
     ${CMAKE_CURRENT_BINARY_DIR}
 )
 
-set(CMAKECONFIG_INSTALL_DIR "${CMAKECONFIG_INSTALL_PREFIX}/KAccounts")
+set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_FULL_CMAKEPACKAGEDIR}/KAccounts")
 
 include(ECMPackageConfigHelpers)
 include(ECMSetupVersion)
 include(CMakePackageConfigHelpers)
 include(WriteBasicConfigVersionFile)
 include(KDECMakeSettings)
 
 ecm_setup_version(${KACCOUNTS_VERSION}
   VARIABLE_PREFIX KACCOUNTS
   VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/kaccounts_version.h"
   PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KAccountsConfigVersion.cmake"
   SOVERSION ${KACCOUNTS_SOVERSION})
 
 set (kaccountslib_SRCS
      kaccountsuiplugin.cpp
      kaccountsdplugin.cpp
      getcredentialsjob.cpp
      core.cpp
 )
 
 
 add_library (kaccounts SHARED
              ${kaccountslib_SRCS}
 )
 
 target_link_libraries (kaccounts
     PUBLIC
         KF5::CoreAddons
         ${ACCOUNTSQT_LIBRARIES}
         Qt5::Xml
         Qt5::Gui
     PRIVATE
         ${SIGNONQT_LIBRARIES}
 )
 
 target_include_directories(kaccounts INTERFACE "$<INSTALL_INTERFACE:${INCLUDE_INSTALL_DIR}/KAccounts>" PUBLIC "${ACCOUNTSQT_INCLUDE_DIRS}" PRIVATE "${SIGNONQT_INCLUDE_DIRS}")
 set_target_properties(kaccounts PROPERTIES VERSION   ${KACCOUNTS_VERSION}
                                            SOVERSION ${KACCOUNTS_SOVERSION}
                                            EXPORT_NAME KAccounts
 )
 
 ecm_configure_package_config_file(
   "${CMAKE_CURRENT_SOURCE_DIR}/KAccountsConfig.cmake.in"
   "${CMAKE_CURRENT_BINARY_DIR}/KAccountsConfig.cmake"
   INSTALL_DESTINATION  ${CMAKECONFIG_INSTALL_DIR}
 )
 
 install(FILES
   "KAccountsMacros.cmake"
   "${CMAKE_CURRENT_BINARY_DIR}/KAccountsConfig.cmake"
   "${CMAKE_CURRENT_BINARY_DIR}/KAccountsConfigVersion.cmake"
   DESTINATION "${CMAKECONFIG_INSTALL_DIR}"
   COMPONENT Devel
 )
 
 install(TARGETS kaccounts EXPORT KAccountsTargets ${INSTALL_TARGETS_DEFAULT_ARGS})
 
 install(EXPORT KAccountsTargets DESTINATION "${CMAKECONFIG_INSTALL_DIR}" FILE KAccountsTargets.cmake ) #NAMESPACE KF5::
 
 install (FILES
         core.h
         getcredentialsjob.h
         kaccountsuiplugin.h
         kaccountsdplugin.h
         kaccounts_export.h
         ${CMAKE_CURRENT_BINARY_DIR}/kaccounts_version.h
         DESTINATION ${INCLUDE_INSTALL_DIR}/KAccounts COMPONENT Devel
 )
 
 add_subdirectory(cmake)
diff --git a/src/lib/KAccountsConfig.cmake.in b/src/lib/KAccountsConfig.cmake.in
index 48ecb76..0922496 100644
--- a/src/lib/KAccountsConfig.cmake.in
+++ b/src/lib/KAccountsConfig.cmake.in
@@ -1,12 +1,12 @@
 @PACKAGE_INIT@
 
 find_dependency(Qt5Widgets @REQUIRED_QT_VERSION@)
 find_dependency(KF5CoreAddons @REQUIRED_KF5_VERSION@)
 find_dependency(AccountsQt5 @ACCOUNTSQT_DEP_VERSION@)
 find_dependency(SignOnQt5 @SIGNONQT_DEP_VERSION@)
 include("${CMAKE_CURRENT_LIST_DIR}/FindAccountsFileDir.cmake")
 
 include("${CMAKE_CURRENT_LIST_DIR}/KAccountsTargets.cmake")
 include("${CMAKE_CURRENT_LIST_DIR}/KAccountsMacros.cmake")
 
-set(KACCOUNTS_MACROS_PATH "@CMAKECONFIG_INSTALL_DIR@/KAccounts")
+set(KACCOUNTS_MACROS_PATH "@CMAKECONFIG_INSTALL_DIR@")