diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0c507b505..e9b3d3488 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,107 +1,117 @@
 cmake_minimum_required(VERSION 3.5)
 set(KF5_VERSION "5.63.0") # handled by release scripts
 
 project(KCalendarCore VERSION ${KF5_VERSION})
 
 # ECM setup
 
 find_package(ECM ${KF5_VERSION} CONFIG REQUIRED)
 set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${KCalendarCore_SOURCE_DIR}/cmake)
 
 include(KDEInstallDirs)
 include(KDECMakeSettings)
 include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
 
 include(GenerateExportHeader)
 include(ECMGenerateHeaders)
 include(ECMGeneratePriFile)
 
 include(ECMSetupVersion)
 include(FeatureSummary)
 include(ECMQtDeclareLoggingCategory)
 include(ECMAddQch)
 
 option(BUILD_QCH "Build API documentation in QCH format (for e.g. Qt Assistant, Qt Creator & KDevelop)" OFF)
 add_feature_info(QCH ${BUILD_QCH} "API documentation in QCH format (for e.g. Qt Assistant, Qt Creator & KDevelop)")
 
 # TODO: remove for KF6
 option(KCALENDARCORE_NO_DEPRECATED_NAMESPACE "Disable deprecated KCalCore namespace" OFF)
 
 if(POLICY CMP0053)
   cmake_policy(SET CMP0053 NEW)
 endif()
 set(QT_REQUIRED_VERSION "5.11.0")
 
 set(KCALENDARCORE_LIB_VERSION ${KF5_VERSION})
 ecm_setup_version(PROJECT VARIABLE_PREFIX KCALENDARCORE
   VERSION_HEADER "${KCalendarCore_BINARY_DIR}/kcalendarcore_version.h"
   PACKAGE_VERSION_FILE "${KCalendarCore_BINARY_DIR}/KF5CalendarCoreConfigVersion.cmake"
   SOVERSION 5
 )
 
 ########### Find packages ###########
 find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Core Gui)
 
 set(LibIcal_MIN_VERSION "2.0")
 find_package(LibIcal ${LibIcal_MIN_VERSION})
 set_package_properties(LibIcal PROPERTIES TYPE REQUIRED)
 if(LibIcal_VERSION VERSION_GREATER "2.98")
   set(HAVE_ICAL_3 TRUE)
   add_definitions(-DUSE_ICAL_3)
 endif()
 
 ########### CMake Config Files ###########
 set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KF5CalendarCore")
 
+if (BUILD_QCH)
+    ecm_install_qch_export(
+        TARGETS KF5CalendarCore_QCH
+        FILE KF5CalendarCoreQchTargets.cmake
+        DESTINATION "${CMAKECONFIG_INSTALL_DIR}"
+        COMPONENT Devel
+    )
+    set(PACKAGE_INCLUDE_QCHTARGETS "include(\"\${CMAKE_CURRENT_LIST_DIR}/KF5CalendarCoreQchTargets.cmake\")")
+endif()
+
 configure_package_config_file(
   "${CMAKE_CURRENT_SOURCE_DIR}/KF5CalendarCoreConfig.cmake.in"
   "${CMAKE_CURRENT_BINARY_DIR}/KF5CalendarCoreConfig.cmake"
   INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR}
 )
 
 
 add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050d00)
 
 add_definitions(-DQT_NO_FOREACH)
 
 ########### Targets ###########
 add_subdirectory(src)
 
 if(BUILD_TESTING)
   find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Test)
   add_subdirectory(autotests)
 endif()
 
 add_subdirectory(cmake)
 
 ########### Install Files ###########
 install(FILES
   "${CMAKE_CURRENT_BINARY_DIR}/KF5CalendarCoreConfig.cmake"
   "${CMAKE_CURRENT_BINARY_DIR}/KF5CalendarCoreConfigVersion.cmake"
   DESTINATION "${CMAKECONFIG_INSTALL_DIR}"
   COMPONENT Devel
 )
 
 install(EXPORT KF5CalendarCoreTargets
   DESTINATION "${CMAKECONFIG_INSTALL_DIR}"
   FILE KF5CalendarCoreTargets.cmake
   NAMESPACE KF5::
 )
 
 install(FILES
   ${CMAKE_CURRENT_BINARY_DIR}/kcalendarcore_version.h
   DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5} COMPONENT Devel
 )
 if (NOT KCALENDARCORE_NO_DEPRECATED_NAMESPACE)
   ecm_setup_version(PROJECT VARIABLE_PREFIX KCALCORE
     VERSION_HEADER "${KCalendarCore_BINARY_DIR}/kcalcore_version.h"
   )
   install(FILES
     ${CMAKE_CURRENT_BINARY_DIR}/kcalcore_version.h
     DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5} COMPONENT Devel
   )
 endif()
 
 install(FILES kcalendarcore.renamecategories kcalendarcore.categories  DESTINATION  ${KDE_INSTALL_LOGGINGCATEGORIESDIR})
 
 feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
diff --git a/KF5CalendarCoreConfig.cmake.in b/KF5CalendarCoreConfig.cmake.in
index 3a617718a..6348ccc6d 100644
--- a/KF5CalendarCoreConfig.cmake.in
+++ b/KF5CalendarCoreConfig.cmake.in
@@ -1,9 +1,11 @@
 @PACKAGE_INIT@
 
 if (NOT @BUILD_SHARED_LIBS@)
     include(CMakeFindDependencyMacro)
     list(INSERT CMAKE_MODULE_PATH 0 ${CMAKE_CURRENT_LIST_DIR})
     find_dependency(LibIcal)
 endif()
 
 include("${CMAKE_CURRENT_LIST_DIR}/KF5CalendarCoreTargets.cmake")
+
+@PACKAGE_INCLUDE_QCHTARGETS@