diff --git a/CMakeLists.txt b/CMakeLists.txt
index 478991b01..386478394 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,6 +5,9 @@ include(CheckIncludeFiles)
 
 if(${CMAKE_SOURCE_DIR} STREQUAL ${kmail_SOURCE_DIR})
     cmake_minimum_required(VERSION 2.8.12)
+    if (POLICY CMP0063)
+        cmake_policy(SET CMP0063 NEW)
+    endif()
     find_package(ECM 5.20.0 REQUIRED NO_MODULE)
     set(CMAKE_MODULE_PATH ${kmail_SOURCE_DIR}/cmake/modules ${ECM_MODULE_PATH})
     include(ECMOptionalAddSubdirectory)
@@ -95,6 +98,9 @@ if(${CMAKE_SOURCE_DIR} STREQUAL ${kmail_SOURCE_DIR})
         set(WEBENGINE_TYPE "QtWebKit")
     endif()
 
+    find_package(KF5AkonadiSearch "5.2.40" CONFIG REQUIRED)
+    set_package_properties(KF5AkonadiSearch PROPERTIES DESCRIPTION "The Akonadi Search libraries" URL "http://www.kde.org" TYPE REQUIRED PURPOSE "Provides search capabilities in KMail and Akonadi")
+
     # Find KF5 package
     find_package(KF5KDELibs4Support ${KF5_VERSION} CONFIG REQUIRED)
     find_package(KF5Wallet ${KF5_VERSION} CONFIG REQUIRED)
@@ -165,6 +171,8 @@ if(${CMAKE_SOURCE_DIR} STREQUAL ${kmail_SOURCE_DIR})
     find_package(KF5KdepimDBusInterfaces ${KDEPIM_APPS_LIB_VERSION_LIB} CONFIG REQUIRED)
     find_package(KF5LibKSieve ${LIBKSIEVE_LIB_VERSION_LIB} CONFIG REQUIRED)
     find_package(MailTransportDBusService CONFIG REQUIRED)
+    # config-enterprise.h is needed for both ENTERPRISE_BUILD and BUILD_EVERYTHING
+    configure_file(config-enterprise.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-enterprise.h )
 
 endif()
 
diff --git a/config-enterprise.h.cmake b/config-enterprise.h.cmake
new file mode 100644
index 000000000..56a2d340f
--- /dev/null
+++ b/config-enterprise.h.cmake
@@ -0,0 +1,2 @@
+#cmakedefine KDEPIM_ENTERPRISE_BUILD 1
+
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 6cba93a5f..e5e0026ab 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -336,9 +336,9 @@ target_link_libraries(kcm_kmail  kmailprivate KF5::KCMUtils KF5::Completion KF5:
 set(kmailpart_PART_SRCS kmail_part.cpp ${kmail_common_SRCS})
 qt5_generate_dbus_interface(kmail_part.h org.kde.kmail.kmailpart.xml OPTIONS -a)
 qt5_add_dbus_adaptor(kmailpart_PART_SRCS
-    ${CMAKE_BINARY_DIR}/kmail/src/org.kde.kmail.kmailpart.xml kmail_part.h KMailPart
+    ${kmail_BINARY_DIR}/src/org.kde.kmail.kmailpart.xml kmail_part.h KMailPart
     )
-qt5_add_dbus_interfaces(kmailpart_PART_SRCS ${CMAKE_BINARY_DIR}/kmail/src/org.kde.kmail.kmailpart.xml)
+qt5_add_dbus_interfaces(kmailpart_PART_SRCS ${kmail_BINARY_DIR}/src/org.kde.kmail.kmailpart.xml)
 add_library(kmailpart MODULE ${kmailpart_PART_SRCS})
 
 target_link_libraries(kmailpart
@@ -410,8 +410,8 @@ install(TARGETS
     DESTINATION ${KDE_INSTALL_PLUGINDIR}
     )
 install(FILES
-    ${CMAKE_BINARY_DIR}/kmail/src/org.kde.kmail.kmailpart.xml
-    ${CMAKE_BINARY_DIR}/kmail/src/org.kde.kmail.kmail.xml
+    ${kmail_BINARY_DIR}/src/org.kde.kmail.kmailpart.xml
+    ${kmail_BINARY_DIR}/src/org.kde.kmail.kmail.xml
     DESTINATION ${KDE_INSTALL_DBUSINTERFACEDIR}
     )
 
diff --git a/src/mailmerge/tests/mailmergewidgettest_gui.cpp b/src/mailmerge/tests/mailmergewidgettest_gui.cpp
index be748ee5a..0aebbe39b 100644
--- a/src/mailmerge/tests/mailmergewidgettest_gui.cpp
+++ b/src/mailmerge/tests/mailmergewidgettest_gui.cpp
@@ -15,7 +15,7 @@
   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
-#include "kmail/src/mailmerge/widgets/mailmergewidget.h"
+#include "../widgets/mailmergewidget.h"
 
 #include <KLocalizedString>
 #include <QApplication>