diff --git a/CMake/PackageDepends/MITK_CTK_Config.cmake b/CMake/PackageDepends/MITK_CTK_Config.cmake
index 273493ba98..21b8c78a9a 100644
--- a/CMake/PackageDepends/MITK_CTK_Config.cmake
+++ b/CMake/PackageDepends/MITK_CTK_Config.cmake
@@ -1,7 +1,18 @@
 # message("In package CTK config")
 find_package(CTK REQUIRED)
-list(APPEND ALL_INCLUDE_DIRECTORIES ${CTK_INCLUDE_DIRS})
-list(APPEND ALL_LIBRARIES ${CTK_LIBRARIES})
-link_directories(${CTK_LIBRARY_DIRS} ${CTK_EXTERNAL_LIBRARY_DIRS})
-
-
+if(CTK_REQUIRED_COMPONENTS_BY_MODULE)
+  foreach(_ctk_component ${CTK_REQUIRED_COMPONENTS_BY_MODULE})
+    list(APPEND ALL_INCLUDE_DIRECTORIES ${${_ctk_component}_INCLUDE_DIRS})
+    list(APPEND ALL_LIBRARIES ${_ctk_component})
+    list(APPEND ALL_LIBRARY_DIRS ${${_ctk_component}_LIBRARY_DIRS})
+  endforeach()
+else()
+  list(APPEND ALL_INCLUDE_DIRECTORIES ${CTK_INCLUDE_DIRS})
+  list(APPEND ALL_LIBRARIES ${CTK_LIBRARIES})
+  link_directories(${CTK_LIBRARY_DIRS})
+  foreach(_ctk_library ${CTK_LIBRARIES})
+      if(${_ctk_library}_LIBRARY_DIRS)
+        list(APPEND ALL_LIBRARY_DIRS "${${_ctk_library}_LIBRARY_DIRS}")
+      endif()
+    endforeach()
+endif()
diff --git a/Modules/DicomUI/CMakeLists.txt b/Modules/DicomUI/CMakeLists.txt
index 6f87d27598..38a08161a4 100644
--- a/Modules/DicomUI/CMakeLists.txt
+++ b/Modules/DicomUI/CMakeLists.txt
@@ -1,7 +1,7 @@
 include_directories(${CTK_INCLUDE_DIRS})
 
 MITK_CREATE_MODULE(mitkDicomUI
   DEPENDS Mitk
-  PACKAGE_DEPENDS CTK Qt4|QtGui+QtSql
+  PACKAGE_DEPENDS CTK|CTKDICOMWidgets Qt4|QtGui+QtSql
   EXPORT_DEFINE MITK_DICOMUI_EXPORT
   )
diff --git a/Modules/QmitkExt/CMakeLists.txt b/Modules/QmitkExt/CMakeLists.txt
index 037f5d0078..aab6bf3cb8 100644
--- a/Modules/QmitkExt/CMakeLists.txt
+++ b/Modules/QmitkExt/CMakeLists.txt
@@ -1,7 +1,5 @@
-include_directories(${CTK_INCLUDE_DIRS})
-
 MITK_CREATE_MODULE( QmitkExt
   INCLUDE_DIRS QmitkApplicationBase QmitkPropertyObservers QmitkFunctionalityComponents
   DEPENDS MitkAlgorithmsExt Qmitk
   PACKAGE_DEPENDS Qt4|QtWebKit Qwt Qxt
 )
diff --git a/Modules/SegmentationUI/CMakeLists.txt b/Modules/SegmentationUI/CMakeLists.txt
index 095e400d1b..c780935d99 100644
--- a/Modules/SegmentationUI/CMakeLists.txt
+++ b/Modules/SegmentationUI/CMakeLists.txt
@@ -1,5 +1,5 @@
 MITK_CREATE_MODULE ( SegmentationUI
 INCLUDE_DIRS Qmitk
 DEPENDS Qmitk Segmentation QmitkExt
-PACKAGE_DEPENDS CTK
+PACKAGE_DEPENDS CTK|CTKWidgets
 )