diff --git a/CMakeLists.txt b/CMakeLists.txt
index d53fd2289..d44aefd9b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -51,6 +51,7 @@ set(KMAILTRANSPORT_LIB_VERSION "5.3.90")
 set(KONTACTINTERFACE_LIB_VERSION "5.3.90")
 set(KMIME_LIB_VERSION "5.3.90")
 set(KPIMTEXTEDIT_LIB_VERSION "5.3.90")
+set(KTNEF_LIB_VERSION "5.3.90")
 set(AKONADI_VERSION "5.3.90")
 
 set(KDEPIM_LIB_VERSION "${KDEPIM_VERSION_NUMBER}")
@@ -131,6 +132,7 @@ find_package(KF5MessageViewer ${MESSAGELIB_LIB_VERSION_LIB} CONFIG REQUIRED)
 find_package(KF5PimCommon ${PIMCOMMON_LIB_VERSION_LIB} CONFIG REQUIRED)
 find_package(KF5SendLater ${KDEPIM_APPS_LIB_VERSION_LIB} CONFIG REQUIRED)
 find_package(KF5TemplateParser ${MESSAGELIB_LIB_VERSION_LIB} CONFIG REQUIRED)
+find_package(KF5Tnef ${KTNEF_LIB_VERSION} CONFIG REQUIRED)
 find_package(MailTransportDBusService CONFIG REQUIRED)
 
 add_definitions(-DQT_NO_URL_CAST_FROM_STRING)
@@ -151,6 +153,7 @@ add_definitions( -DQT_NO_CAST_TO_ASCII )
 
 add_subdirectory(src)
 add_subdirectory(agents)
+add_subdirectory(ktnef)
 
 install( FILES kmail.renamecategories kmail.categories DESTINATION ${KDE_INSTALL_CONFDIR} )
 
diff --git a/ktnef/CMakeLists.txt b/ktnef/CMakeLists.txt
index 008b186df..e910f2119 100644
--- a/ktnef/CMakeLists.txt
+++ b/ktnef/CMakeLists.txt
@@ -1,54 +1,11 @@
 project(ktnef)
 
-if(${CMAKE_SOURCE_DIR} STREQUAL ${ktnef_SOURCE_DIR})
-    cmake_minimum_required(VERSION 3.1)
-    set(KF5_VERSION "5.25.0")
-    find_package(ECM ${KF5_VERSION} REQUIRED NO_MODULE)
-    set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
-    include(ECMInstallIcons)
-
-    include(ECMOptionalAddSubdirectory)
-    include(ECMSetupVersion)
-    include(ECMAddTests)
-    include(ECMMarkNonGuiExecutable)
-    include(GenerateExportHeader)
-    include(ECMGenerateHeaders)
-    include(CMakePackageConfigHelpers)
-    include(FeatureSummary)
-    include(CheckFunctionExists)
-    include(ECMGeneratePriFile)
-
-    include(KDEInstallDirs)
-    include(KDECMakeSettings)
-    include(KDECompilerSettings NO_POLICY_SCOPE)
-    include(ECMAddAppIcon)
-    include(ECMQtDeclareLoggingCategory)
-
-    set(QT_REQUIRED_VERSION "5.6.0")
-    find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Gui Widgets)
-
-    set(KTNEF_LIB_VERSION "5.3.40")
-    find_package(KF5Tnef ${KTNEF_LIB_VERSION} CONFIG REQUIRED)
-    find_package(KF5DBusAddons ${KF5_VERSION} CONFIG REQUIRED)
-    find_package(KF5CoreAddons ${KF5_VERSION} CONFIG REQUIRED)
-    find_package(KF5Crash ${KF5_VERSION} REQUIRED)
-
-    include_directories(${ktnef_SOURCE_DIR} ${ktnef_BINARY_DIR} ${ktnef_BINARY_DIR}/src)
-endif()
-
-add_definitions(-DQT_NO_URL_CAST_FROM_STRING)
-add_definitions(-DQT_USE_QSTRINGBUILDER)
 include(TestBigEndian)
 test_big_endian(CMAKE_WORDS_BIGENDIAN)
 configure_file(src/config-ktnef.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/src/config-ktnef.h)
-add_definitions( -DQT_NO_CAST_FROM_ASCII )
-add_definitions( -DQT_NO_CAST_TO_ASCII )
 
 add_subdirectory(src)
 
 install( FILES ktnef.categories DESTINATION ${KDE_INSTALL_CONFDIR} )
 
-if ("${CMAKE_BINARY_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
-    add_subdirectory(doc)
-    feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
-endif()
+add_subdirectory(doc)