diff --git a/CMake/Findlz4.cmake b/CMake/Findlz4.cmake
index a79f05ade4..e9c68dccc4 100644
--- a/CMake/Findlz4.cmake
+++ b/CMake/Findlz4.cmake
@@ -1,35 +1,35 @@
 find_path(lz4_INCLUDE_DIR lz4.h
   PATHS ${MITK_EXTERNAL_PROJECT_PREFIX}
   PATH_SUFFIXES include
   NO_DEFAULT_PATH
 )
 mark_as_advanced(lz4_INCLUDE_DIR)
 
 
 find_library(lz4_LIBRARY_RELEASE lz4
   PATHS ${MITK_EXTERNAL_PROJECT_PREFIX}
-  PATH_SUFFIXES lib
+  PATH_SUFFIXES lib lib64
   NO_DEFAULT_PATH)
 mark_as_advanced(lz4_LIBRARY_RELEASE)
 
 
 find_library(lz4_LIBRARY_DEBUG lz4d
   PATHS ${MITK_EXTERNAL_PROJECT_PREFIX}
-  PATH_SUFFIXES lib
+  PATH_SUFFIXES lib lib64
   NO_DEFAULT_PATH)
 mark_as_advanced(lz4_LIBRARY_DEBUG)
 
 set(lz4_LIBRARIES)
 
 if(lz4_LIBRARY_RELEASE)
   list(APPEND lz4_LIBRARIES optimized ${lz4_LIBRARY_RELEASE})
 endif()
 
 if(lz4_LIBRARY_DEBUG)
   list(APPEND lz4_LIBRARIES debug ${lz4_LIBRARY_DEBUG})
 endif()
 
 find_package_handle_standard_args(lz4
   FOUND_VAR lz4_FOUND
   REQUIRED_VARS lz4_INCLUDE_DIR lz4_LIBRARIES
 )
diff --git a/CMakeExternals/lz4.cmake b/CMakeExternals/lz4.cmake
index 84d36c855a..5f63e12c42 100644
--- a/CMakeExternals/lz4.cmake
+++ b/CMakeExternals/lz4.cmake
@@ -1,50 +1,54 @@
 #-----------------------------------------------------------------------------
 # lz4
 #-----------------------------------------------------------------------------
 
 if(MITK_USE_lz4)
   # Sanity checks
   if(DEFINED lz4_DIR AND NOT EXISTS "${lz4_DIR}")
     message(FATAL_ERROR "lz4_DIR variable is defined but corresponds to non-existing directory")
   endif()
 
   set(proj lz4)
   set(proj_DEPENDENCIES )
   set(lz4_DEPENDS ${proj})
 
   if(NOT DEFINED lz4_DIR)
 
     set(additional_args )
 
+    if(NOT CMAKE_DEBUG_POSTFIX)
+      list(APPEND additional_args "-DCMAKE_DEBUG_POSTFIX:STRING=d")
+    endif()
+
     if(CTEST_USE_LAUNCHERS)
       list(APPEND additional_args
         "-DCMAKE_PROJECT_${proj}_INCLUDE:FILEPATH=${CMAKE_ROOT}/Modules/CTestUseLaunchers.cmake"
       )
     endif()
 
     ExternalProject_Add(${proj}
       LIST_SEPARATOR ${sep}
       GIT_REPOSITORY https://github.com/lz4/lz4.git
       GIT_TAG v1.9.3
       SOURCE_SUBDIR build/cmake
       CMAKE_GENERATOR ${gen}
       CMAKE_GENERATOR_PLATFORM ${gen_platform}
       CMAKE_ARGS
         ${ep_common_args}
         ${additional_args}
       CMAKE_CACHE_ARGS
         ${ep_common_cache_args}
         -DLZ4_BUILD_CLI:BOOL=OFF
         -DLZ4_BUILD_LEGACY_LZ4C:BOOL=OFF
       CMAKE_CACHE_DEFAULT_ARGS
         ${ep_common_cache_default_args}
       DEPENDS ${proj_DEPENDENCIES}
     )
 
     set(lz4_DIR "${ep_prefix}")
     mitkFunctionInstallExternalCMakeProject(${proj})
 
   else()
     mitkMacroEmptyExternalProject(${proj} "${proj_DEPENDENCIES}")
   endif()
 endif()