diff --git a/CMakeLists.txt b/CMakeLists.txt
index 008bee6..9cc59d3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,130 +1,130 @@
 cmake_minimum_required(VERSION 3.5)
 set(PIM_VERSION "5.12.42")
 project(KItinerary VERSION ${PIM_VERSION})
 
 set(CMAKE_CXX_STANDARD 14)
 set(KF5_MIN_VERSION "5.63.0")
 
 find_package(ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE)
 set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake)
 
 include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
 include(ECMAddTests)
 include(ECMGenerateHeaders)
 include(ECMQtDeclareLoggingCategory)
 include(ECMSetupVersion)
 include(FeatureSummary)
 include(KDEInstallDirs)
 include(KDECMakeSettings)
 include(GenerateExportHeader)
 
 ecm_setup_version(PROJECT VARIABLE_PREFIX KITINERARY
     VERSION_HEADER kitinerary_version.h
     PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KPimItineraryConfigVersion.cmake"
 )
 
 set(QT_REQUIRED_VERSION "5.11.0")
 
 
 find_package(Qt5 ${QT_REQUIRED_VERSION} REQUIRED COMPONENTS Test Gui Qml)
 find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS I18n)
 if (NOT ANDROID)
     find_package(SharedMimeInfo 1.3 REQUIRED)
 endif()
 
 set(KMIME_VERSION "5.12.40")
-
+set(PIM_PKPASS "5.12.40")
 
 find_package(KF5Mime ${KMIME_VERSION} CONFIG REQUIRED)
 find_package(KF5CalendarCore ${KF5_MIN_VERSION} CONFIG)
 find_package(KF5Contacts ${KF5_MIN_VERSION} CONFIG REQUIRED)
-find_package(KPimPkPass CONFIG REQUIRED)
+find_package(KPimPkPass ${PIM_PKPASS} CONFIG REQUIRED)
 find_package(Poppler COMPONENTS Core)
 set_package_properties("Poppler" PROPERTIES TYPE OPTIONAL PURPOSE "Support for extraction from PDF booking confirmations.")
 find_package(ZXing CONFIG)
 set_package_properties("ZXing" PROPERTIES TYPE OPTIONAL PURPOSE "Support for barcode decoding." URL "https://github.com/nu-book/zxing-cpp")
 find_package(ZLIB REQUIRED)
 set_package_properties("ZLIB" PROPERTIES PURPOSE "Support for decoding UIC 918-3 train tickets.")
 find_package(LibXml2 MODULE)
 set_package_properties("LibXml2" PROPERTIES PURPOSE "Support for extraction from HTML booking confirmations." URL "http://libxml.org")
 find_package(PhoneNumber OPTIONAL_COMPONENTS PhoneNumber QUIET)
 set_package_properties("PhoneNumber" PROPERTIES PURPOSE "Parsing and geo-coding of phone numbers.")
 
 if (NOT ANDROID)
     set_package_properties(KF5CalendarCore PROPERTIES TYPE REQUIRED)
     set_package_properties(LibXml2 PROPERTIES TYPE REQUIRED)
 endif()
 
 if(TARGET Poppler::Core)
     # check if we have private Poppler headers
     find_file(HAVE_POPPLER_UNSTABLE_HEADERS "OutputDev.h" PATHS ${Poppler_INCLUDE_DIRS} NO_DEFAULT_PATH)
     if (NOT HAVE_POPPLER_UNSTABLE_HEADERS)
         message(WARNING "Poppler was not build with ENABLE_UNSTABLE_API_ABI_HEADER - building without PDF support!")
         set(HAVE_POPPLER FALSE)
     else()
         set(HAVE_POPPLER TRUE)
     endif()
 endif()
 if (HAVE_POPPLER)
     if (${Poppler_VERSION} VERSION_GREATER 0.57)
         set(HAVE_POPPLER_0_58 ON)
     endif()
     if (${Poppler_VERSION} VERSION_GREATER 0.68)
         set(HAVE_POPPLER_0_69 ON)
     endif()
     if (${Poppler_VERSION} VERSION_GREATER 0.71)
         set(HAVE_POPPLER_0_72 ON)
     endif()
     if (${Poppler_VERSION} VERSION_GREATER 0.81)
         set(HAVE_POPPLER_0_82 ON)
     endif()
 endif()
 
 if (TARGET ZXing::Core)
     set(HAVE_ZXING ON)
 endif()
 
 if (TARGET KF5::CalendarCore)
     set(HAVE_KCAL ON)
 endif()
 if (LIBXML2_FOUND)
     set(HAVE_LIBXML2 ON)
 endif()
 if (TARGET PhoneNumber::PhoneNumber)
     set(HAVE_PHONENUMBER ON)
 endif()
 
 add_definitions(-DTRANSLATION_DOMAIN=\"kitinerary\")
 
 if (EXISTS "${CMAKE_SOURCE_DIR}/.git")
    add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x060000)
 endif()
 
 add_definitions(-DQT_NO_FOREACH)
 
 add_subdirectory(src)
 if(BUILD_TESTING)
    add_subdirectory(autotests)
 endif()
 feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES)
 
 set(CMAKECONFIG_INSTALL_DIR "${CMAKECONFIG_INSTALL_PREFIX}/KPimItinerary")
 
 configure_package_config_file(
     "${CMAKE_CURRENT_SOURCE_DIR}/KPimItineraryConfig.cmake.in"
     "${CMAKE_CURRENT_BINARY_DIR}/KPimItineraryConfig.cmake"
     INSTALL_DESTINATION "${CMAKECONFIG_INSTALL_DIR}"
 )
 
 install(FILES
         "${CMAKE_CURRENT_BINARY_DIR}/KPimItineraryConfig.cmake"
         "${CMAKE_CURRENT_BINARY_DIR}/KPimItineraryConfigVersion.cmake"
         DESTINATION "${CMAKECONFIG_INSTALL_DIR}"
         COMPONENT Devel)
 
 install(EXPORT KPimItineraryTargets
         DESTINATION "${CMAKECONFIG_INSTALL_DIR}"
         FILE KPimItineraryTargets.cmake
         NAMESPACE KPim::
 )
 install(FILES org_kde_kitinerary.categories  DESTINATION  ${KDE_INSTALL_LOGGINGCATEGORIESDIR})
diff --git a/KPimItineraryConfig.cmake.in b/KPimItineraryConfig.cmake.in
index ad3d9ad..62b2707 100644
--- a/KPimItineraryConfig.cmake.in
+++ b/KPimItineraryConfig.cmake.in
@@ -1,26 +1,26 @@
 @PACKAGE_INIT@
 
 include(CMakeFindDependencyMacro)
 find_dependency(Qt5Gui)
-find_dependency(KF5Mime)
+find_dependency(KF5Mime "@KMIME_VERSION@")
 if (@HAVE_KCAL@)
-    find_dependency(KF5CalendarCore)
+    find_dependency(KF5CalendarCore "@KF5_MIN_VERSION@")
 endif()
-find_dependency(KF5Contacts)
-find_dependency(KPimPkPass)
+find_dependency(KF5Contacts "@KF5_MIN_VERSION@")
+find_dependency(KPimPkPass "@PIM_PKPASS@")
 
 if (NOT @BUILD_SHARED_LIBS@)
     find_dependency(ZLIB)
     if (@HAVE_POPPLER@)
         find_dependency(Poppler)
     endif()
     if (@HAVE_ZXING@)
         find_dependency(ZXing)
     endif()
     if (@HAVE_LIBXML2@)
         find_dependency(LibXml2)
     endif()
 endif()
 
 include("${CMAKE_CURRENT_LIST_DIR}/KPimItineraryTargets.cmake")
 @PACKAGE_INCLUDE_QCHTARGETS@