diff --git a/CMakeExternals/PatchSOFA-rev8935.cmake b/CMakeExternals/PatchSOFA-rev8935.cmake
new file mode 100644
index 0000000000..e10c1bbd70
--- /dev/null
+++ b/CMakeExternals/PatchSOFA-rev8935.cmake
@@ -0,0 +1,7 @@
+set(baseDir "framework/sofa/helper/system/")
+foreach(sourceFile "${baseDir}gl.h" "${baseDir}glu.h" "${baseDir}glut.h" "${baseDir}../gl/glfont.cpp")
+  file(STRINGS ${sourceFile} sourceCode NEWLINE_CONSUME)
+  string(REGEX REPLACE "<(Open)?GL(UT)?/" "<" sourceCode ${sourceCode})
+  set(CONTENTS ${sourceCode})
+  configure_file(${TEMPLATE_FILE} ${sourceFile} @ONLY)
+endforeach()
\ No newline at end of file
diff --git a/CMakeExternals/SOFA.cmake b/CMakeExternals/SOFA.cmake
index aa33622554..f42e40fed6 100644
--- a/CMakeExternals/SOFA.cmake
+++ b/CMakeExternals/SOFA.cmake
@@ -1,173 +1,176 @@
 #-----------------------------------------------------------------------------
 # 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()
 
   function(write_downloadfile_script script_filename remote local md5)
     file(WRITE ${script_filename}
 "message(STATUS \"downloading...
      src='${remote}'
      dst='${local}'\")
 
 file(DOWNLOAD
   \"${remote}\"
   \"${local}\"
   SHOW_PROGRESS
   EXPECTED_MD5 ${md5}
   STATUS status
   LOG log)
 
 list(GET status 0 status_code)
 list(GET status 1 status_string)
 
 if(NOT status_code EQUAL 0)
   message(FATAL_ERROR \"error: downloading '${remote}' failed
      status_code: \${status_code}
      status_string: \${status_string}
      log: \${log}\")
 endif()
 
 message(STATUS \"downloading... done\")")
   endfunction()
 
   function(write_extractfile_script script_filename filename directory)
     set(args "")
 
     if(filename MATCHES "(\\.|=)(bz2|tar\\.gz|tgz|zip)$")
       set(args "xfz")
     elseif(filename MATCHES "(\\.|=)tar$")
       set(args "xf")
     else()
       message(SEND_ERROR "error: do not know how to extract '${filename}' -- known types are .bz2, .tar, .tar.gz, .tgz, and .zip")
       return()
     endif()
 
     file(WRITE ${script_filename}
 "get_filename_component(filename \"${filename}\" ABSOLUTE)
 get_filename_component(directory \"${directory}\" ABSOLUTE)
 
 message(STATUS \"extracting...
      src='\${filename}'
      dst='\${directory}'\")
 
 if(NOT EXISTS \"\${filename}\")
   message(FATAL_ERROR \"error: file to extract does not exists: '\${filename}'\")
 endif()
 
 set(i 0)
 while(EXISTS \"\${directory}/../tmp-\${i}\")
   math(EXPR i \"\${i} + 1\")
 endwhile()
 set(ut_dir \"\${directory}/../tmp-\${i}\")
 file(MAKE_DIRECTORY \"\${ut_dir}\")
 
 message(STATUS \"extracting... [tar ${args}]\")
 execute_process(COMMAND \${CMAKE_COMMAND} -E tar ${args} \${filename} WORKING_DIRECTORY \${ut_dir} RESULT_VARIABLE rv)
 
 if(NOT rv EQUAL 0)
   message(STATUS \"extracting... [error clean up]\")
   file(REMOVE_RECURSE \"\${ut_dir}\")
   message(FATAL_ERROR \"error: extract of '\${filename}' failed\")
 endif()
 
 message(STATUS \"extracting... [copy]\")
 file(GLOB contents \"\${ut_dir}/*\")
 file(COPY \${contents} DESTINATION \${directory})
 
 message(STATUS \"extracting... [clean up]\")
 file(REMOVE_RECURSE \"\${ut_dir}\")
 
 message(STATUS \"extracting... done\")")
   endfunction()
 
   set(proj SOFA)
   set(proj_DEPENDENCIES)
   set(SOFA_DEPENDS ${proj})
 
   set(stamp_dir "${CMAKE_BINARY_DIR}/${proj}-cmake/src/${proj}-stamp")
   set(download_dir "${CMAKE_BINARY_DIR}/${proj}-cmake/src")
   set(source_dir "${CMAKE_BINARY_DIR}/${proj}-src")
 
   set(url_base "http://dl.dropbox.com/u/5822501/")
   set(rev "8935")
   set(file "sofa-rev${rev}.zip")
   set(md5 "3d151df2b797130a9b8fa4fd60cc4cab")
 
   write_downloadfile_script(
     "${stamp_dir}/download-sofa.cmake"
     "${url_base}${file}"
     "${download_dir}/${file}"
     "${md5}"
   )
 
   write_extractfile_script(
     "${stamp_dir}/extract-sofa.cmake"
     "${download_dir}/${file}"
     "${source_dir}"
   )
 
   set(download_cmd ${CMAKE_COMMAND} -P ${stamp_dir}/download-sofa.cmake)
   list(APPEND download_cmd ${CMAKE_COMMAND} -P ${stamp_dir}/extract-sofa.cmake)
 
-  set(file "sofa-rev${rev}-patch.zip")
-  set(md5 "1584acde8a206d96b837c2b04855667e")
+  set(file "sofa-rev${rev}-gl.zip")
+  set(md5 "5e21312e2bff45cbff1979bfb6249a9f")
 
   write_downloadfile_script(
-    "${stamp_dir}/download-patch.cmake"
+    "${stamp_dir}/download-gl.cmake"
     "${url_base}${file}"
     "${download_dir}/${file}"
     "${md5}"
   )
 
   write_extractfile_script(
-    "${stamp_dir}/extract-patch.cmake"
+    "${stamp_dir}/extract-gl.cmake"
     "${download_dir}/${file}"
     "${source_dir}"
   )
 
-  list(APPEND download_cmd ${CMAKE_COMMAND} -P ${stamp_dir}/download-patch.cmake)
-  list(APPEND download_cmd ${CMAKE_COMMAND} -P ${stamp_dir}/extract-patch.cmake)
+  list(APPEND download_cmd ${CMAKE_COMMAND} -P ${stamp_dir}/download-gl.cmake)
+  list(APPEND download_cmd ${CMAKE_COMMAND} -P ${stamp_dir}/extract-gl.cmake)
 
   set(file "sofa-rev${rev}-cmake.zip")
-  set(md5 "8235d8790e084fe8209ef74bfb353dcd")
+  set(md5 "8381ec98ad47b48f34d19b836bc1063c")
 
   write_downloadfile_script(
     "${stamp_dir}/download-cmake.cmake"
     "${url_base}${file}"
     "${download_dir}/${file}"
     "${md5}"
   )
 
   write_extractfile_script(
     "${stamp_dir}/extract-cmake.cmake"
     "${download_dir}/${file}"
     "${source_dir}"
   )
 
   list(APPEND download_cmd ${CMAKE_COMMAND} -P ${stamp_dir}/download-cmake.cmake)
   list(APPEND download_cmd ${CMAKE_COMMAND} -P ${stamp_dir}/extract-cmake.cmake)
 
+  set(SOFA_PATCH_COMMAND ${CMAKE_COMMAND} -DTEMPLATE_FILE:FILEPATH=${MITK_SOURCE_DIR}/CMakeExternals/EmptyFileForPatching.dummy -P ${MITK_SOURCE_DIR}/CMakeExternals/PatchSOFA-rev8935.cmake)
+
   if(NOT DEFINED SOFA_DIR)
     ExternalProject_Add(${proj}
       SOURCE_DIR ${source_dir}
       BINARY_DIR ${proj}-build
       PREFIX ${proj}-cmake
       DOWNLOAD_COMMAND "${download_cmd}"
+      PATCH_COMMAND ${SOFA_PATCH_COMMAND}
       INSTALL_COMMAND ""
       CMAKE_GENERATOR ${gen}
       CMAKE_ARGS
         ${ep_common_args}
         ${additional_cmake_args}
       DEPENDS ${proj_DEPENDENCIES}
     )
 
     set(SOFA_DIR ${CMAKE_CURRENT_BINARY_DIR}/${proj}-build)
   else()
     mitkMacroEmptyExternalProject(${proj} "${proj}_DEPENDENCIES}")
   endif()
 endif()