diff --git a/Builds/CMake/FindBoost.cmake b/Builds/CMake/deps/FindBoost.cmake
similarity index 100%
rename from Builds/CMake/FindBoost.cmake
rename to Builds/CMake/deps/FindBoost.cmake
diff --git a/Builds/CMake/Findjemalloc.cmake b/Builds/CMake/deps/Findjemalloc.cmake
similarity index 100%
rename from Builds/CMake/Findjemalloc.cmake
rename to Builds/CMake/deps/Findjemalloc.cmake
diff --git a/Builds/CMake/deps/Soci.cmake b/Builds/CMake/deps/Soci.cmake
index 013d1aff8b..0bf022bea2 100644
--- a/Builds/CMake/deps/Soci.cmake
+++ b/Builds/CMake/deps/Soci.cmake
@@ -79,6 +79,7 @@ else()
       -DBOOST_ROOT=${BOOST_ROOT}
       -DWITH_BOOST=ON
       -DBoost_FOUND=ON
+      -DBoost_NO_BOOST_CMAKE=ON
       -DBoost_DATE_TIME_FOUND=ON
       -DSOCI_HAVE_BOOST=ON
       -DSOCI_HAVE_BOOST_DATE_TIME=ON
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8e56957877..3328a80050 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,6 +4,8 @@ if (POLICY CMP0074)
   cmake_policy(SET CMP0074 NEW)
 endif ()
 
+project (rippled)
+
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/Builds/CMake")
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/Builds/CMake/deps")
 
@@ -20,7 +22,6 @@ include (ProcessorCount)
 if (target)
   message (FATAL_ERROR "The target option has been removed - use native cmake options to control build")
 endif ()
-project (rippled)
 
 include(RippledSanity)
 include(RippledVersion)