diff --git a/CMakeExternals/ChangeHDF5LibsInstallNameForMac.cmake.in b/CMakeExternals/ChangeHDF5LibsInstallNameForMac.cmake.in
deleted file mode 100644
index ebe1f89651..0000000000
--- a/CMakeExternals/ChangeHDF5LibsInstallNameForMac.cmake.in
+++ /dev/null
@@ -1,17 +0,0 @@
-# Get all the shared libraries which are located in the HDF5-install/lib directory
-file(GLOB dylibFiles @HDF5_DIR@/lib/*.dylib)
-
-# For each shared library call the install_name_tool in order to change the install name of the according library
-foreach(_dylib ${dylibFiles})
-   message("Fixing HDF5 install name for lib: ${_dylib}")
-   execute_process(COMMAND install_name_tool -id ${_dylib} ${_dylib})
-   foreach(_dep_dylib ${dylibFiles})
-      get_filename_component(_dep_dylib_name ${_dep_dylib} NAME)
-      execute_process(COMMAND install_name_tool -change ${_dep_dylib_name} \@loader_path/${_dep_dylib_name} ${_dylib})
-   endforeach()
-endforeach()
-
-
-
-
-
diff --git a/CMakeExternals/HDF5.cmake b/CMakeExternals/HDF5.cmake
index b336c0cd5b..bc0d68bba7 100644
--- a/CMakeExternals/HDF5.cmake
+++ b/CMakeExternals/HDF5.cmake
@@ -1,59 +1,59 @@
 #-----------------------------------------------------------------------------
 # HDF5
 #-----------------------------------------------------------------------------
 
 if(MITK_USE_HDF5)
 
   # Sanity checks
   if(DEFINED HDF5_DIR AND NOT EXISTS ${HDF5_DIR})
     message(FATAL_ERROR "HDF5_DIR variable is defined but corresponds to non-existing directory")
   endif()
 
   set(proj HDF5)
   set(proj_DEPENDENCIES )
   set(HDF5_DEPENDS ${proj})
 
   if(NOT DEFINED HDF5_DIR)
 
     set(additional_args )
     if(CTEST_USE_LAUNCHERS)
       list(APPEND additional_args
         "-DCMAKE_PROJECT_${proj}_INCLUDE:FILEPATH=${CMAKE_ROOT}/Modules/CTestUseLaunchers.cmake"
       )
     endif()
 
     # We might build static libs with  -DBUILD_SHARED_LIBS=0 but this conflicts with
     # the in ITK integrated version! So we need to go the way with dynamic libs. Too
     # bad :( This would be fixed by using an external HDF-Installation with ITK/VTK
 
     ExternalProject_Add(${proj}
-       URL ${MITK_THIRDPARTY_DOWNLOAD_PREFIX_URL}/hdf5-1.8.17.tar.gz
-       URL_MD5 7d572f8f3b798a628b8245af0391a0ca
+       GIT_REPOSITORY https://github.com/HDFGroup/hdf5.git
+       GIT_TAG hdf5-1_8_17
        CMAKE_GENERATOR ${gen}
        CMAKE_GENERATOR_PLATFORM ${gen_platform}
        CMAKE_ARGS
          ${ep_common_args}
          ${additional_args}
          -DHDF5_BUILD_HL_LIB:BOOL=ON
          -DHDF5_BUILD_CPP_LIB:BOOL=ON
          -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
        CMAKE_CACHE_ARGS
          ${ep_common_cache_args}
        CMAKE_CACHE_DEFAULT_ARGS
          ${ep_common_cache_default_args}
        DEPENDS ${proj_DEPENDENCIES}
       )
 
     ExternalProject_Get_Property(${proj} install_dir)
     if(WIN32)
       set(HDF5_DIR ${install_dir}/cmake/)
     else()
       set(HDF5_DIR ${install_dir}/share/cmake)
     endif()
 
   else()
 
     mitkMacroEmptyExternalProject(${proj} "${proj_DEPENDENCIES}")
 
   endif()
 endif(MITK_USE_HDF5)