diff --git a/Modules/DiffusionImaging/Connectomics/CMakeLists.txt b/Modules/DiffusionImaging/Connectomics/CMakeLists.txt
index cbc6a47819..e1571dbb2d 100644
--- a/Modules/DiffusionImaging/Connectomics/CMakeLists.txt
+++ b/Modules/DiffusionImaging/Connectomics/CMakeLists.txt
@@ -1,6 +1,7 @@
 MITK_CREATE_MODULE( Connectomics
+  SUBPROJECTS MITK-DTI
   INCLUDE_DIRS Algorithms IODataStructures Rendering ${CMAKE_CURRENT_BINARY_DIR}
   DEPENDS DiffusionCore FiberTracking
 )
 
 add_subdirectory(Testing)
\ No newline at end of file
diff --git a/Modules/DiffusionImaging/FiberTracking/CMakeLists.txt b/Modules/DiffusionImaging/FiberTracking/CMakeLists.txt
index 261cd51200..b35573c98d 100644
--- a/Modules/DiffusionImaging/FiberTracking/CMakeLists.txt
+++ b/Modules/DiffusionImaging/FiberTracking/CMakeLists.txt
@@ -1,13 +1,14 @@
 MITK_CREATE_MODULE( FiberTracking
+  SUBPROJECTS MITK-DTI
   INCLUDE_DIRS Algorithms Algorithms/GibbsTracking Algorithms/StochasticTracking IODataStructures IODataStructures/FiberBundleX IODataStructures/PlanarFigureComposite Interactions SignalModels Rendering ${CMAKE_CURRENT_BINARY_DIR}
   DEPENDS DiffusionCore MitkGraphAlgorithms
 )
 
-if(FiberTracking_IS_ENABLED)
+if(MODULE_IS_ENABLED)
   file(DOWNLOAD http://mitk.org/download/data/FibertrackingLUT.tar.gz ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/FibertrackingLUT.tar.gz TIMEOUT 10)
   execute_process(COMMAND ${CMAKE_COMMAND} -E chdir ${CMAKE_RUNTIME_OUTPUT_DIRECTORY} tar xzf FibertrackingLUT.tar.gz)
   configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Rendering/mitkShaderFiberClipping.xml ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/mitkShaderFiberClipping.xml)
   MITK_INSTALL(FILES ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/mitkShaderFiberClipping.xml ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/FiberTrackingLUTBaryCoords.bin ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/FiberTrackingLUTIndices.bin)
 endif()
 
 add_subdirectory(Testing)
\ No newline at end of file
diff --git a/Modules/DiffusionImaging/Quantification/CMakeLists.txt b/Modules/DiffusionImaging/Quantification/CMakeLists.txt
index 76fb5624b4..71d73e4220 100644
--- a/Modules/DiffusionImaging/Quantification/CMakeLists.txt
+++ b/Modules/DiffusionImaging/Quantification/CMakeLists.txt
@@ -1,8 +1,9 @@
 #DiffusionImaging/Quantification
 MITK_CREATE_MODULE( Quantification
+  SUBPROJECTS MITK-DTI
   INCLUDE_DIRS Algorithms IODataStructures IODataStructures/TbssImages Rendering ${CMAKE_CURRENT_BINARY_DIR}
   DEPENDS DiffusionCore FiberTracking MitkGraphAlgorithms
 )
 
 add_subdirectory(Testing)