diff --git a/Applications/ExtApp/CMakeLists.txt b/Applications/ExtApp/CMakeLists.txt
index 846124d55e..6eced226e2 100644
--- a/Applications/ExtApp/CMakeLists.txt
+++ b/Applications/ExtApp/CMakeLists.txt
@@ -1,73 +1,60 @@
 FIND_PACKAGE(BlueBerry REQUIRED)
 
 # TODO: this can be removed after resolving factory issues, it's only necessary for the registration call in main()
 MITK_USE_MODULE(MitkExt)
 
 INCLUDE_DIRECTORIES(
   ${BLUEBERRY_PLUGIN_SOURCE_DIRS} 
   ${org.blueberry.osgi_BIN_DIR} # needed for generated berryConfig.h 
   ${Poco_INCLUDE_DIRS}
   ${ALL_INCLUDE_DIRECTORIES}
 )
 LINK_DIRECTORIES(${Poco_LIBRARY_DIRS}
                  ${BLUEBERRY_PLUGINS_OUTPUT_DIR}/org.blueberry.osgi/bin
                 )
   
 IF(MITK_SHOW_CONSOLE_WINDOW)
   ADD_EXECUTABLE(ExtApp MACOSX_BUNDLE ExtApp.cpp)
 ELSE(MITK_SHOW_CONSOLE_WINDOW)
   ADD_EXECUTABLE(ExtApp MACOSX_BUNDLE WIN32 ExtApp.cpp)
 ENDIF(MITK_SHOW_CONSOLE_WINDOW)
 
 IF (WIN32)
   FIND_PACKAGE(Qt4)
   TARGET_LINK_LIBRARIES(ExtApp ${QT_QTCORE_LIBRARY} ${QT_QTMAIN_LIBRARY})
 ENDIF(WIN32)
 
 TARGET_LINK_LIBRARIES(ExtApp 
                       optimized PocoFoundation      debug PocoFoundationd 
                       optimized PocoUtil            debug PocoUtild 
                       optimized org_blueberry_osgi debug org_blueberry_osgi${BLUEBERRY_DEBUG_POSTFIX}
                       ${ALL_LIBRARIES})
 
 SET_TARGET_PROPERTIES(ExtApp PROPERTIES INSTALL_RPATH "${CMAKE_INSTALL_RPATH};${CMAKE_INSTALL_RPATH}/BlueBerry/org.blueberry.osgi/bin")
 
-SET(EXTAPP_REQUIRED_BUNDLES
-org.mitk.gui.qt.datamanager
-org.mitk.gui.qt.imagenavigator
-)
-FOREACH(EXTAPP_REQUIRED_BUNDLE ${EXTAPP_REQUIRED_BUNDLES})
-  SET(MITK_BUILD_${EXTAPP_REQUIRED_BUNDLE} "ON" CACHE BOOL "Build ${EXTAPP_REQUIRED_BUNDLE} Plugin" FORCE)
-  STRING(REPLACE "." "_" EXTAPP_REQUIRED_BUNDLE_PROJECT ${EXTAPP_REQUIRED_BUNDLE})
-  SET(MITK_MODULES_ENABLED_PLUGINS ${MITK_MODULES_ENABLED_PLUGINS} ${EXTAPP_REQUIRED_BUNDLE_PROJECT})
-ENDFOREACH()
-
-#MESSAGE(STATUS ${MITK_MODULES_ENABLED_PLUGINS})
-
 SET(_plugin_deps ${BLUEBERRY_ENABLED_PLUGINS} ${MITK_CORE_ENABLED_PLUGINS} ${MITK_MODULES_ENABLED_PLUGINS})
 
 IF(_plugin_deps)
   # Make sure all enabled plug-ins are up to date
   ADD_DEPENDENCIES(ExtApp ${_plugin_deps})
-  # TARGET_LINK_LIBRARIES(ExtApp ${_plugin_deps})
 ENDIF()
 
 SET(BLUEBERRY_PLUGIN_CACHE_DIR "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/plugin_cache")
 
 CONFIGURE_FILE(ExtApp.ini
                ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/ExtApp.ini)
 
 IF(WIN32)
   FOREACH(EXTAPP_BUILD_TYPE debug release)
     mitkFunctionCreateWindowsBatchScript(startExtApp.bat.in
       ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/startExtApp_${EXTAPP_BUILD_TYPE}.bat
       ${EXTAPP_BUILD_TYPE})
   ENDFOREACH()
 ENDIF(WIN32)
 
 MITK_INSTALL_TARGETS(EXECUTABLES ExtApp GLOB_PLUGINS )
 
 IF(UNIX AND MITK_INSTALL_RPATH_RELATIVE AND NOT APPLE)
   INSTALL(PROGRAMS "${MITK_SOURCE_DIR}/CMake/RunInstalledApp.sh" DESTINATION "." RENAME ExtApp.sh)
 ENDIF()
 SET(MITK_CPACK_PACKAGE_EXECUTABLES ${MITK_CPACK_PACKAGE_EXECUTABLES} "ExtApp;MITK - ExtApp Application" CACHE INTERNAL "Collecting windows shortcuts to executables")
diff --git a/CMake/mitkSuperBuildPlugins.cmake b/CMake/mitkSuperBuildPlugins.cmake
index 6fdec1688d..218b57030a 100644
--- a/CMake/mitkSuperBuildPlugins.cmake
+++ b/CMake/mitkSuperBuildPlugins.cmake
@@ -1,14 +1,13 @@
 set(MITK_SUPERBUILD_PLUGINS
   org.mitk.gui.qt.basicimageprocessing
-  org.mitk.gui.qt.datamanager
   org.mitk.gui.qt.diffusionimaging
   org.mitk.gui.qt.imagecropper
   org.mitk.gui.qt.imagestatistics
   org.mitk.gui.qt.isosurface
   org.mitk.gui.qt.materialeditor
   org.mitk.gui.qt.measurement
   org.mitk.gui.qt.regiongrowing
   org.mitk.gui.qt.segmentation
   org.mitk.gui.qt.simplemeasurement
   org.mitk.gui.qt.volumevisualization
 )
diff --git a/Modules/Bundles/CMakeLists.txt b/Modules/Bundles/CMakeLists.txt
index 244d70e4e7..bf6a99cc78 100644
--- a/Modules/Bundles/CMakeLists.txt
+++ b/Modules/Bundles/CMakeLists.txt
@@ -1,32 +1,34 @@
 
 IF(MITK_USE_BLUEBERRY)
 
   # INCLUDE("${MITK_BINARY_DIR}/mitkExtConfig.cmake")
   # INCLUDE("${MITK_BINARY_DIR}/QmitkExtConfig.cmake")
 
   INCLUDE("${MITK_BINARY_DIR}/Bundles/MITKCoreBundleList.cmake")
   
   SET(_mitk_bundles_default 
       "org.mitk.core.ext" 
       "org.mitk.planarfigure"
   )
   
   IF(QT4_FOUND)
     LIST(APPEND _mitk_bundles_default "org.mitk.gui.qt.ext" "org.mitk.gui.qt.extapplication")
+    # ExtApp required bundles
+    LIST(APPEND _mitk_bundles_default "org.mitk.gui.qt.imagenavigator" "org.mitk.gui.qt.datamanager")
   ENDIF()
   
   SET(PLUGIN_EXCLUDE_LIST 
     org.mitk.gui.qt.volumetry
   )
 
   MACRO_COLLECT_PLUGINS(OUTPUT_DIR ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/ExtBundles
                         CACHE_PLUGIN_SOURCE_DIRS MITK_MODULES_PLUGIN_SOURCE_DIRS
                         CACHE_PLUGIN_OUTPUT_DIRS MITK_MODULES_PLUGIN_OUTPUT_DIRS
                         CACHE_PLUGIN_TARGETS MITK_MODULES_ENABLED_PLUGINS
                         BUNDLE_LIST_PATH "${MITK_BINARY_DIR}/Bundles/MITKModulesBundleList.cmake" 
                         CMAKE_CACHE_PREFIX "MITK"
                         PLUGIN_DEFAULT_ON ${_mitk_bundles_default}
                         PLUGIN_EXCLUDES ${PLUGIN_EXCLUDE_LIST}
                         ${MITK_BUILD_ALL_PLUGINS_OPTION})
    
 ENDIF(MITK_USE_BLUEBERRY)