diff --git a/CMake/PackageDepends/MITK_Boost_Config.cmake b/CMake/PackageDepends/MITK_Boost_Config.cmake
index c1606aaa95..e695001bf2 100644
--- a/CMake/PackageDepends/MITK_Boost_Config.cmake
+++ b/CMake/PackageDepends/MITK_Boost_Config.cmake
@@ -1,30 +1,31 @@
 if(MITK_USE_Boost)
 
   if(NOT MITK_USE_SYSTEM_Boost)
     set(Boost_NO_SYSTEM_PATHS 1)
   endif()
 
   set(Boost_USE_MULTITHREADED 1)
   set(Boost_USE_STATIC_LIBS 0)
   set(Boost_USE_STATIC_RUNTIME 0)
 
   if(MITK_USE_Boost_LIBRARIES)
     if(NOT MITK_USE_SYSTEM_Boost)
-      set(BOOST_INCLUDEDIR ${CMAKE_BINARY_DIR}/../Boost-install/include/boost-1_54)
+      set(BOOST_INCLUDEDIR ${CMAKE_BINARY_DIR}/../Boost-install/include)
       set(BOOST_LIBRARYDIR ${CMAKE_BINARY_DIR}/../Boost-install/lib)
+      set(Boost_ADDITIONAL_VERSIONS 1.54)
       # Following line is temporary, see bug #15837.
       set(Boost_DEBUG TRUE)
     endif()
     find_package(Boost 1.54.0 REQUIRED COMPONENTS ${MITK_USE_Boost_LIBRARIES})
   else()
     find_package(Boost 1.54.0 REQUIRED)
   endif()
 
   list(APPEND ALL_INCLUDE_DIRECTORIES ${Boost_INCLUDE_DIRS})
   if(Boost_LIBRARIES)
     list(APPEND ALL_LIBRARIES ${Boost_LIBRARIES})
     link_directories(${Boost_LIBRARY_DIRS})
   endif()
 
 endif(MITK_USE_Boost)
 
diff --git a/CMakeExternals/SOFA.cmake b/CMakeExternals/SOFA.cmake
index c22c470b93..e1135c1736 100644
--- a/CMakeExternals/SOFA.cmake
+++ b/CMakeExternals/SOFA.cmake
@@ -1,78 +1,79 @@
 #-----------------------------------------------------------------------------
 # SOFA
 #-----------------------------------------------------------------------------
 
 if(MITK_USE_SOFA)
   # Sanity checks
   if(DEFINED SOFA_DIR AND NOT EXISTS ${SOFA_DIR})
     message(FATAL_ERROR "SOFA_DIR variable is defined but corresponds to non-existing directory")
   endif()
 
   set(proj SOFA)
   set(proj_DEPENDENCIES Boost)
   set(SOFA_DEPENDS ${proj})
 
   set(additional_cmake_args
     -DSOFA-APPLICATION_MODELER:BOOL=OFF
     -DSOFA-APPLICATION_RUNSOFA:BOOL=OFF
     -DSOFA-APPLICATION_SOFABATCH:BOOL=OFF
     -DSOFA-EXTERNAL_BOOST_PATH:PATH=${CMAKE_BINARY_DIR}/Boost-install/lib
     -DSOFA-EXTERNAL_HAVE_BOOST:BOOL=ON
     -DSOFA-EXTERNAL_HAVE_GLEW:BOOL=OFF
     -DSOFA-EXTERNAL_HAVE_ZLIB:BOOL=OFF
     -DSOFA-EXTERNAL_HAVE_PNG:BOOL=OFF
     -DSOFA-LIB_COMPONENT_OPENGL_VISUAL:BOOL=OFF
     -DSOFA-LIB_GUI_GLUT:BOOL=OFF
     -DSOFA-LIB_GUI_QTVIEWER:BOOL=OFF
     -DSOFA-MISC_NO_OPENGL:BOOL=ON
     -DSOFA-TUTORIAL_CHAIN_HYBRID:BOOL=OFF
     -DSOFA-TUTORIAL_COMPOSITE_OBJECT:BOOL=OFF
     -DSOFA-TUTORIAL_MIXED_PENDULUM:BOOL=OFF
     -DSOFA-TUTORIAL_ONE_PARTICLE:BOOL=OFF
     -DSOFA-TUTORIAL_ONE_TETRAHEDRON:BOOL=OFF
   )
 
   if(NOT MITK_USE_SYSTEM_Boost)
     list(APPEND boost_cmake_args
       -DBoost_DEBUG:BOOL=ON
       -DBoost_NO_SYSTEM_PATHS:BOOL=ON
-      -DBOOST_INCLUDEDIR:PATH=${CMAKE_BINARY_DIR}/Boost-install/include/boost-1_54
+      -DBOOST_INCLUDEDIR:PATH=${CMAKE_BINARY_DIR}/Boost-install/include
       -DBOOST_LIBRARYDIR:PATH=${CMAKE_BINARY_DIR}/Boost-install/lib
+      -DBoost_ADDITIONAL_VERSIONS:STRING=1.54
     )
   endif()
 
   set(rev "9832")
 
   set(SOFA_PATCH_COMMAND ${CMAKE_COMMAND} -DTEMPLATE_FILE:FILEPATH=${MITK_SOURCE_DIR}/CMakeExternals/EmptyFileForPatching.dummy -P ${MITK_SOURCE_DIR}/CMakeExternals/PatchSOFA-rev${rev}.cmake)
   set(SOFA_PRECONFIGURE_COMMAND ${CMAKE_COMMAND} -G${gen} ${ep_common_args} ${boost_cmake_args} ${CMAKE_BINARY_DIR}/${proj}-src)
 
   if(NOT DEFINED SOFA_DIR)
     ExternalProject_Add(${proj}
       SOURCE_DIR ${CMAKE_BINARY_DIR}/${proj}-src
       BINARY_DIR ${proj}-build
       PREFIX ${proj}-cmake
       URL http://mitk.org/download/thirdparty/SOFA-rev${rev}.tar.gz
       URL_MD5 ff65b2813dcc27755844f95cb0392bcf
       PATCH_COMMAND ${SOFA_PATCH_COMMAND}
       INSTALL_COMMAND ""
       CMAKE_GENERATOR ${gen}
       CMAKE_ARGS
         ${ep_common_args}
         ${additional_cmake_args}
         ${boost_cmake_args}
       DEPENDS ${proj_DEPENDENCIES}
     )
 
     ExternalProject_Add_Step(${proj} preconfigure
       COMMAND ${SOFA_PRECONFIGURE_COMMAND}
       WORKING_DIRECTORY ${proj}-build
       DEPENDEES patch
       DEPENDERS configure
       LOG 1
     )
 
     set(SOFA_DIR ${CMAKE_CURRENT_BINARY_DIR}/${proj}-build)
   else()
     mitkMacroEmptyExternalProject(${proj} "${proj}_DEPENDENCIES}")
   endif()
 endif()