diff --git a/CMakeLists.txt b/CMakeLists.txt
index f0b06075..63b9c171 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -97,25 +97,26 @@ add_definitions(${CLANG_DEFINITIONS})
 set(Boost_USE_MULTITHREAD ON)
 set(Boost_USE_STATIC_LIBS ON)
 set(Boost_USE_STATIC_RUNTIME OFF)
-set(BOOST_LIBRARYDIR $ENV{BOOST_159_DIR})
+set(BOOST_LIBRARYDIR $ENV{BOOST_DIR})
 
 if(UNIX AND NOT APPLE)
 	set(BOOST_ROOT $ENV{BOOST_DIR})
 elseif(UNIX AND APPLE)
-	set(BOOST_ROOT $ENV{BOOST_159_DIR})
+	set(BOOST_ROOT $ENV{BOOST_DIR})
 	set(Boost_NO_SYSTEM_PATHS ON)
 else()
+	set(BOOST_INCLUDEDIR $ENV{BOOST_DIR})
 	STRING(REGEX REPLACE "\\\\" "/" BOOST_LIBRARYDIR ${BOOST_LIBRARYDIR})
 
 	if(${WINXXBITS} STREQUAL "Win32")
-		set(BOOST_ROOT "${BOOST_LIBRARYDIR}/win32")
+		set(BOOST_LIBRARYDIR "${BOOST_LIBRARYDIR}/lib32-msvc-14")
 	else()
-		set(BOOST_ROOT "${BOOST_LIBRARYDIR}/win64")
+		set(BOOST_LIBRARYDIR "${BOOST_LIBRARYDIR}/lib64-msvc-14")
 	endif()
 	set(Boost_NO_SYSTEM_PATHS ON)
 endif()
 
-find_package(Boost 1.59 COMPONENTS system program_options filesystem date_time REQUIRED)
+find_package(Boost 1.64 COMPONENTS system program_options filesystem date_time REQUIRED)
 
 # Botan -------------------------------------------------------------------------
 
diff --git a/README.md b/README.md
index 807ca13c..3110dba8 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@
 * CxxTest 4.3
 * Valgrind 3.9.0 (linux)
 * Clang & LLVM 4.0.1 (doesnt quite work for windows, use unix setup below and skip all the ninja stuff)(installation guide http://clang.llvm.org/docs/LibASTMatchersTutorial.html)
-* Boost 1.59
+* Boost 1.64
 * Botan 2.1.0
 
 also something about java, but who knows...
@@ -18,7 +18,7 @@ also something about java, but who knows...
 
 * CXX_TEST_DIR - .../cxxtest-4.3
 * CLANG_DIR - .../clang-llvm
-* BOOST_159_DIR - .../boost_1_59_0
+* BOOST_DIR - .../boost_1_64_0
 * BOTAN_DIR - .../Botan-2.1.0
 
 For MacOS and Linux
@@ -42,7 +42,7 @@ Execute Cmake twice (once for each target compiler (32 and 64 bit)). Set the res
 ##### Boost setup
 
 For Windows:
-Build the Boost libs for 32 and 64 bit. Create the subdirectories ${BOOST_159_DIR}/win32 and ${BOOST_159_DIR}/win64 and copy the ${BOOST_159_DIR}/boost folder into each of those platform specific directories. Also move the platform specific libs into the respective ( ${BOOST_159_DIR}/win32/lib and ${BOOST_159_DIR}/win64/lib) folder.
+Build the Boost libs for 32 and 64 bit. Make sure that the platform specific libs are located in ${BOOST_DIR}/lib32-msvc-14 and ${BOOST_DIR}/lib64-msvc-14.
 
 ##### Botan setup