diff --git a/CMake/FindDCMQI.cmake b/CMake/FindDCMQI.cmake
index a62fbb2c13..2c4f215b03 100644
--- a/CMake/FindDCMQI.cmake
+++ b/CMake/FindDCMQI.cmake
@@ -1,48 +1,47 @@
 set(DCMQI_DIR ${MITK_EXTERNAL_PROJECT_PREFIX}/src/DCMQI-build)
 
 find_path(DCMQI_INCLUDE_DIR
   NAMES DCMQI/DCMQI
   PATHS ${DCMQI_DIR}/../DCMQI ${MITK_EXTERNAL_PROJECT_PREFIX} ${CMAKE_PREFIX_PATH}
   PATH_SUFFIXES include include/DCMQI
 )
 
 set(DCMQI_INCLUDE_DIR ${MITK_EXTERNAL_PROJECT_PREFIX}/src/DCMQI/include ${MITK_EXTERNAL_PROJECT_PREFIX}/src/DCMQI/jsoncpp ${DCMQI_DIR})
 
 find_package_handle_standard_args(DCMQI
   FOUND_VAR DCMQI_FOUND
   REQUIRED_VARS DCMQI_INCLUDE_DIR
 )
 
 # Find all libraries, store debug and release separately
   # Find Release libraries
   find_library(DCMQI_LIBRARY_RELEASE
     dcmqi
     PATHS
     ${DCMQI_DIR}/bin
     ${DCMQI_DIR}/bin/Release
     NO_DEFAULT_PATH
     )
 
   # Find Debug libraries
   find_library(DCMQI_LIBRARY_DEBUG
-    dcmqi
+    dcmqi${DCMTK_CMAKE_DEBUG_POSTFIX}
     PATHS
     ${DCMQI_DIR}/bin
     ${DCMQI_DIR}/bin/Debug
     NO_DEFAULT_PATH
     )
 
   mark_as_advanced(DCMQI_LIBRARY_RELEASE)
   mark_as_advanced(DCMQI_LIBRARY_DEBUG)
 
   # Add libraries to variable according to build type
   set(DCMQI_LIBRARY)
+  mark_as_advanced(DCMQI_LIBRARY)
   if(DCMQI_LIBRARY_RELEASE)
-    list(APPEND DCMQI_LIBRARIES optimized ${DCMQI_LIBRARY_RELEASE})
     list(APPEND DCMQI_LIBRARY optimized ${DCMQI_LIBRARY_RELEASE})
   endif()
 
   if(DCMQI_LIBRARY_DEBUG)
-    list(APPEND DCMQI_LIBRARIES debug ${DCMQI_LIBRARY_DEBUG})
     list(APPEND DCMQI_LIBRARY debug ${DCMQI_LIBRARY_DEBUG})
   endif()
diff --git a/CMake/PackageDepends/MITK_DCMQI_Config.cmake b/CMake/PackageDepends/MITK_DCMQI_Config.cmake
index 9912c843e2..b92a015991 100644
--- a/CMake/PackageDepends/MITK_DCMQI_Config.cmake
+++ b/CMake/PackageDepends/MITK_DCMQI_Config.cmake
@@ -1,2 +1,4 @@
-list(APPEND ALL_INCLUDE_DIRECTORIES ${DCMQI_INCLUDE_DIR}))
-list(APPEND ALL_LIBRARIES ${DCMQI_LIBRARY}))
+list(APPEND ALL_INCLUDE_DIRECTORIES ${DCMQI_INCLUDE_DIR})
+list(APPEND ALL_LIBRARIES ${DCMQI_LIBRARY})
+message("Config DCMQI_INCLUDE_DIR: ${DCMQI_INCLUDE_DIR}")
+message("Config DCMQI_LIBRARY: ${DCMQI_LIBRARY}")
diff --git a/CMakeExternals/DCMQI.cmake b/CMakeExternals/DCMQI.cmake
index 8e9287174c..930d5dd01c 100644
--- a/CMakeExternals/DCMQI.cmake
+++ b/CMakeExternals/DCMQI.cmake
@@ -1,56 +1,57 @@
 #-----------------------------------------------------------------------------
 # DCMQI
 #-----------------------------------------------------------------------------
 
 if(MITK_USE_DCMQI)
-  set(proj DCMQI)
-  set(proj_DEPENDENCIES DCMTK ITK)
-  set(${proj}_DEPENDS ${proj})
 
   # Sanity checks
-  if(DEFINED ${proj}_DIR AND NOT EXISTS ${${proj}_DIR})
-    message(FATAL_ERROR "${proj}_DIR variable is defined but corresponds to non-existing directory")
+  if(DEFINED DCMQI_DIR AND NOT EXISTS ${DCMQI_DIR})
+    message(FATAL_ERROR "DCMQI_DIR variable is defined but corresponds to non-existing directory")
   endif()
 
-  if(NOT DEFINED ${proj}_DIR)
+  set(proj DCMQI)
+  set(proj_DEPENDENCIES DCMTK ITK)
+  set(DCMQI_DEPENDS ${proj})
+
+  if(NOT DEFINED DCMQI_DIR)
     set(additional_cmake_args)
 
     if(CTEST_USE_LAUNCHERS)
       list(APPEND additional_cmake_args
       "-DCMAKE_PROJECT_${proj}_INCLUDE:FILEPATH=${CMAKE_ROOT}/Modules/CTestUseLaunchers.cmake"
       )
     endif()
 
     ExternalProject_Add(${proj}
       LIST_SEPARATOR ${sep}
       #TODO MITK-Data
       URL https://dl.dropbox.com/s/1rye5oewqxx4zn5/dcmqi-src-org.tar.gz
       URL_MD5 d56a6a11a84a753c7498be5dce8f7a34
       PATCH_COMMAND ${PATCH_COMMAND} -N -p1 -i ${CMAKE_CURRENT_LIST_DIR}/DCMQI.patch
       UPDATE_COMMAND ""
       INSTALL_COMMAND ""
       CMAKE_GENERATOR ${gen}
       CMAKE_ARGS
         ${ep_common_args}
         ${additional_cmake_args}
         #-DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
         -DDCMQI_SUPERBUILD:BOOL=OFF
         -DDCMTK_DIR:PATH=${DCMTK_DIR}
         -DITK_DIR:PATH=${ITK_DIR}
       CMAKE_CACHE_ARGS
         ${ep_common_cache_args}
       CMAKE_CACHE_DEFAULT_ARGS
         ${ep_common_cache_default_args}
       DEPENDS ${proj_DEPENDENCIES}
     )
 
 
     ExternalProject_Get_Property(${proj} binary_dir)
-    set(${proj}_DIR ${binary_dir})
+    set(DCMQI_DIR ${binary_dir})
     #set(${proj}_DIR ${ep_prefix})
     #message(${proj}_DIR: ${${proj}_DIR})
     #mitkFunctionInstallExternalCMakeProject(${proj})
   else()
     mitkMacroEmptyExternalProject(${proj} "${proj_DEPENDENCIES}")
   endif()
 endif()