diff --git a/external/external_build.cmake b/external/external_build.cmake
index 53037ed..458b803 100644
--- a/external/external_build.cmake
+++ b/external/external_build.cmake
@@ -2,8 +2,8 @@ include(FindOpenMP)
 
 OPTION(ENABLE_OPENMP "Set to Yes if Healpix and/or you need openMP" OFF)
 
-SET(FFTW_URL "http://www.fftw.org/fftw-3.3.3.tar.gz" CACHE URL "URL to download FFTW from")
-SET(EIGEN_URL "http://bitbucket.org/eigen/eigen/get/3.2.10.tar.gz" CACHE URL "URL to download Eigen from")
+SET(FFTW_URL "http://www.fftw.org/fftw-3.3.3.tar.gz" CACHE STRING "URL to download FFTW from")
+SET(EIGEN_URL "http://bitbucket.org/eigen/eigen/get/3.2.10.tar.gz" CACHE STRING "URL to download Eigen from")
 SET(GENGETOPT_URL "ftp://ftp.gnu.org/gnu/gengetopt/gengetopt-2.22.5.tar.gz" CACHE STRING "URL to download gengetopt from")
 SET(HDF5_URL "https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.8/hdf5-1.8.18/src/hdf5-1.8.18.tar.bz2" CACHE STRING "URL to download HDF5 from")
 SET(NETCDF_URL "ftp://ftp.unidata.ucar.edu/pub/netcdf/netcdf-4.5.0.tar.gz" CACHE STRING "URL to download NetCDF from")
@@ -246,10 +246,13 @@ if (INTERNAL_BOOST)
   set(Boost_DEP boost)
 
 ELSE (INTERNAL_BOOST)
-  find_package(Boost 1.53 QUIET)
-  set(Boost_DEP)
+  find_package(Boost 1.69 QUIET)
   if (NOT Boost_FOUND)
-    cmessage(CWARNING "Boost >= 1.53 was not found")
+    cmessage(CWARNING "Boost >= 1.69 was not found")
+  endif()
+  if (${Boost_VERSION} VERSION_GREATER_EQUAL 1.70.0)
+    set(Boost_DEP Boost::headers)
+    set(Boost_TARGET Boost::headers PARENT_SCOPE)
   endif()
 endif (INTERNAL_BOOST)
 mark_as_advanced(Boost_INCLUDE_DIRS Boost_LIBRARIES)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 2cc4b29..3d6b1ff 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -72,7 +72,7 @@ SET(CosmoTool_SRCS ${CosmoTool_SRCS}
 
 include_directories(${GSL_INCLUDE_PATH} ${CMAKE_BINARY_DIR}/src)
 
-set(CosmoTool_LIBS ${GSL_LIBRARIES})
+set(CosmoTool_LIBS ${GSL_LIBRARIES} ${Boost_TARGET})
 if(YORICK_SUPPORT)
   set(CosmoTool_LIBS ${CosmoTool_LIBS} ${NETCDFCPP_LIBRARY} ${NETCDF_LIBRARY} ${GSL_LIBRARIES})
   include_directories(${NETCDF_INCLUDE_PATH} ${NETCDFCPP_INCLUDE_PATH})