diff --git a/CMakeLists.txt b/CMakeLists.txt
index 974cae50..35a4efd0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -177,6 +177,9 @@ include_directories(${Boost_INCLUDE_DIRS})
 set(BOOST_LIBRARY ${Boost_LIBRARIES})
 set(BOOST_INCLUDE_DIR ${Boost_INCLUDE_DIRS})
 
+set(TRIQS_LIBRARY_BOOST ${Boost_LIBRARIES})
+set(TRIQS_INCLUDE_BOOST ${Boost_INCLUDE_DIRS})
+
 message(STATUS  "Boost include dir: ${BOOST_INCLUDE_DIR}")
 message(STATUS  "Boost libraries: ${BOOST_LIBRARY}")
 
diff --git a/cmake/TRIQSConfig.cmake.in b/cmake/TRIQSConfig.cmake.in
index c6298407..4338391a 100644
--- a/cmake/TRIQSConfig.cmake.in
+++ b/cmake/TRIQSConfig.cmake.in
@@ -9,7 +9,7 @@ set(TRIQS_CXX_DEFINITIONS @TRIQS_CXX_DEFINITIONS@)
 # Includes
 set(TRIQS_INCLUDE @CMAKE_INSTALL_PREFIX@/include)
 
-set(TRIQS_INCLUDE_BOOST   @BOOST_INCLUDE_DIR@)
+set(TRIQS_INCLUDE_BOOST   @TRIQS_INCLUDE_BOOST@)
 set(TRIQS_INCLUDE_MPI     @TRIQS_INCLUDE_MPI@)
 set(TRIQS_INCLUDE_PYTHON  @TRIQS_INCLUDE_PYTHON@)
 set(TRIQS_INCLUDE_HDF5    @TRIQS_INCLUDE_HDF5@)
@@ -20,7 +20,7 @@ set(TRIQS_INCLUDE_GSL     @GSL_INCLUDE_DIR@)
 # Libraries
 set(TRIQS_LIBRARY -L@CMAKE_INSTALL_PREFIX@/lib -ltriqs)  
 
-set(TRIQS_LIBRARY_BOOST   @BOOST_LIBRARY@)
+set(TRIQS_LIBRARY_BOOST   @TRIQS_LIBRARY_BOOST@)
 set(TRIQS_LIBRARY_MPI     @TRIQS_LIBRARY_MPI@)
 set(TRIQS_LIBRARY_PYTHON  @TRIQS_LIBRARY_PYTHON@)
 set(TRIQS_LIBRARY_HDF5    @TRIQS_LIBRARY_HDF5@)
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index 790598fb..b0bb4b1c 100644
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -29,27 +29,18 @@ set( link_libs " ${TRIQS_LIBRARY_ALL}")
 if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
  list (REMOVE_DUPLICATES link_libs)
 endif( ${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
-string(REPLACE "boost_for_triqs" " " TMP "${link_libs}")
-string(REPLACE "debug" " " TMP "${TMP}")
+string(REPLACE "debug" " " TMP "${link_libs}")
 string(REPLACE "optimized" " " TMP "${TMP}")
 
-set(DOC_AUTOCOMPILE_INCLUDE ${BOOST_SOURCE_DIR} ${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/foreignlibs ${TRIQS_INCLUDE_ALL}  )
+set(DOC_AUTOCOMPILE_INCLUDE ${CMAKE_SOURCE_DIR} ${TRIQS_INCLUDE_ALL})
 if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
- if(BOOST_SOURCE_DIR)
-   set(DOC_AUTOCOMPILE_LINK "-L ${CMAKE_BINARY_DIR}/foreignlibs/boost -lboost_for_triqs -L ${CMAKE_BINARY_DIR}/triqs -ltriqs  ${TMP} ")
- else(BOOST_SOURCE_DIR)
-   set(DOC_AUTOCOMPILE_LINK "${BOOST_LIBRARY} -L ${CMAKE_BINARY_DIR}/triqs -ltriqs  ${TMP} ")
- endif(BOOST_SOURCE_DIR)
+ set(DOC_AUTOCOMPILE_LINK "${TRIQS_LIBRARY_BOOST} -L ${CMAKE_BINARY_DIR}/triqs -ltriqs ${TMP}")
  set(DOC_AUTOCOMPILE_DEFINITIONS -std=c++0x -DBOOST_PP_VARIADICS=1 -stdlib=libc++ -I/System/Library/Frameworks/vecLib.framework/Versions/A/Headers)
 else()
- if(BOOST_SOURCE_DIR)
-   set(DOC_AUTOCOMPILE_LINK "-L ${CMAKE_BINARY_DIR}/foreignlibs/boost -lboost_for_triqs -L ${CMAKE_BINARY_DIR}/triqs -ltriqs  ${TMP} -Wl,-rpath=${CMAKE_CURRENT_BINARY_DIR} ")
- else(BOOST_SOURCE_DIR)
-   set(DOC_AUTOCOMPILE_LINK "${BOOST_LIBRARY} -L ${CMAKE_BINARY_DIR}/triqs -ltriqs  ${TMP} -Wl,-rpath=${CMAKE_CURRENT_BINARY_DIR} ")
- endif(BOOST_SOURCE_DIR)
+ set(DOC_AUTOCOMPILE_LINK "${TRIQS_LIBRARY_BOOST} -L ${CMAKE_BINARY_DIR}/triqs -ltriqs  ${TMP} -Wl,-rpath=${CMAKE_CURRENT_BINARY_DIR} ")
  set(DOC_AUTOCOMPILE_DEFINITIONS -std=c++0x -DBOOST_PP_VARIADICS=1 )
 endif()
-set(DOC_AUTOCOMPILE_LD_LIBRARY_PATH "${CMAKE_BINARY_DIR}/foreignlibs/boost/:${CMAKE_BINARY_DIR}/triqs")
+set(DOC_AUTOCOMPILE_LD_LIBRARY_PATH "${CMAKE_BINARY_DIR}/triqs")
 set(DOC_AUTOCOMPILE_DEFINITIONS ${DOC_AUTOCOMPILE_DEFINITIONS} -DTRIQS_BUILDING_LIBRARY -I ${CMAKE_BINARY_DIR}/Config )
 
 # debug
@@ -88,7 +79,7 @@ set(doxy_top ${CMAKE_CURRENT_BINARY_DIR}/doxy.log)
 add_custom_command (OUTPUT ${doxy_top} DEPENDS ${DOXYGEN_SOURCES} COMMAND ${DOXYGEN_EXECUTABLE} Doxyfile > ${doxy_top} )
 add_custom_target(docs_doxy ALL DEPENDS ${doxy_top})
 add_dependencies(docs_sphinx docs_doxy) # we must first have doxygen process the sources to link to them
-add_dependencies(docs_sphinx triqs boost_for_triqs ) # add also mpi ?
+add_dependencies(docs_sphinx triqs)
 
 # Install
 install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html/ COMPONENT documentation DESTINATION share/doc/triqs
@@ -113,12 +104,10 @@ install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html/ COMPONENT documentation DEST
 
 install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/themes/agogo DESTINATION share/triqs/themes)
 install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/themes/triqs DESTINATION share/triqs/themes)
-install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/_static DESTINATION share/triqs/export)
-install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/_templates DESTINATION share/triqs/export)
 
 # PDF documentation
 if (Build_PDF_Documentation)
- add_dependencies(docs_sphinx_pdf_cpp triqs boost_for_triqs ) # add also mpi ?
+ add_dependencies(docs_sphinx_pdf_cpp triqs )
  install(FILES ${sphinx_top_pdf} DESTINATION share/doc/triqs/)
 endif()