diff --git a/CMake/FindBreakpad.cmake b/CMake/FindBreakpad.cmake
new file mode 100644
index 0000000000..9bc73f6bd7
--- /dev/null
+++ b/CMake/FindBreakpad.cmake
@@ -0,0 +1,6 @@
+
+FIND_PATH(Breakpad_INCLUDE_DIR breakpad_googletest_includes.h DOC  "Directory breakpad/src/" PATHS ${Breakpad_SRC}/src ${Breakpad_DIR})
+
+message(STATUS "FindBreakpad...")
+message(STATUS " .. include at ${Breakpad_INCLUDE_DIR}")
+message(STATUS " .. link libraries ${Breakpad_LIBRARIES}")
diff --git a/Modules/BreakpadCrashReporting/CMakeLists.txt b/Modules/BreakpadCrashReporting/CMakeLists.txt
index f53321d397..f9ee93917c 100644
--- a/Modules/BreakpadCrashReporting/CMakeLists.txt
+++ b/Modules/BreakpadCrashReporting/CMakeLists.txt
@@ -1,161 +1,158 @@
 # TODOs
 #  LATER nicer separation of Linux/Window/.. code
 #  OK test should check existence of dump file
 #  - find nice script to use linux symbol writer tool dump_.. on all relevant libraries
 #  - update documentation
 #  OK check buildtype (O2/-g/..) in cmake
 #  - use the same library structure in "our" cmake script as google uses in their build
 #    - otherwise we cannot switch between custom-built versions of breakpad and our superbuild version
 
 function(checkWindowsCompilerFlags)
   # TODO simplify this with foreach and some string functions
   set (WINDOWS_CXX_FLAGS_OK_ZI 0)
   if ( CMAKE_CXX_FLAGS_DEBUG MATCHES .*/Zi.* )
     set(WINDOWS_CXX_FLAGS_OK_ZI 1)
   endif()
   if ( CMAKE_CXX_FLAGS_RELEASE MATCHES .*/Zi.* )
     set(WINDOWS_CXX_FLAGS_OK_ZI 1)
   endif()
   if ( CMAKE_CXX_FLAGS MATCHES .*/Zi.* )
     set(WINDOWS_CXX_FLAGS_OK_ZI 1)
   endif()
 
   set (WINDOWS_C_FLAGS_OK_ZI 0)
   if ( CMAKE_C_FLAGS_DEBUG MATCHES .*/Zi.* )
     set(WINDOWS_C_FLAGS_OK_ZI 1)
   endif()
   if ( CMAKE_C_FLAGS_RELEASE MATCHES .*/Zi.* )
     set(WINDOWS_C_FLAGS_OK_ZI 1)
   endif()
   if ( CMAKE_C_FLAGS MATCHES .*/Zi.* )
     set(WINDOWS_C_FLAGS_OK_ZI 1)
   endif()
 
   set (WINDOWS_CXX_FLAGS_OK_DEBUG 0)
   if ( CMAKE_CXX_FLAGS_DEBUG MATCHES .*/debug.* )
     set(WINDOWS_CXX_FLAGS_OK_DEBUG 1)
   endif()
   if ( CMAKE_CXX_FLAGS_RELEASE MATCHES .*/debug.* )
     set(WINDOWS_CXX_FLAGS_OK_DEBUG 1)
   endif()
   if ( CMAKE_CXX_FLAGS MATCHES .*/debug.* )
     set(WINDOWS_CXX_FLAGS_OK_DEBUG 1)
   endif()
 
   set (WINDOWS_C_FLAGS_OK_DEBUG 0)
   if ( CMAKE_C_FLAGS_DEBUG MATCHES .*/debug.* )
     set(WINDOWS_C_FLAGS_OK_DEBUG 1)
   endif()
   if ( CMAKE_C_FLAGS_RELEASE MATCHES .*/debug.* )
     set(WINDOWS_C_FLAGS_OK_DEBUG 1)
   endif()
   if ( CMAKE_C_FLAGS MATCHES .*/debug.* )
     set(WINDOWS_C_FLAGS_OK_DEBUG 1)
   endif()
 
   if (NOT WINDOWS_CXX_FLAGS_OK_ZI)
     message(WARNING "When using the breakpad crash reporting module, you should use the /Zi flag in CMAKE_CXX_FLAGS (_RELEASE)")
   endif()
   if (NOT WINDOWS_C_FLAGS_OK_ZI)
     message(WARNING "When using the breakpad crash reporting module, you should use the /Zi flag in CMAKE_C_FLAGS (_RELEASE)")
   endif()
 
   if (NOT WINDOWS_CXX_FLAGS_OK_DEBUG)
     message(WARNING "When using the breakpad crash reporting module, you should use the /debug flag in CMAKE_CXX_FLAGS (_RELEASE)")
   endif()
   if (NOT WINDOWS_C_FLAGS_OK_DEBUG)
     message(WARNING "When using the breakpad crash reporting module, you should use the /debug flag in CMAKE_C_FLAGS (_RELEASE)")
   endif()
 endfunction()
 
 function(checkLinuxCompilerFlags)
   # TODO simplify this with foreach and some string functions
   set (LINUX_CXX_FLAGS_OK_G 0)
   if ( CMAKE_CXX_FLAGS_DEBUG MATCHES .*-g.* )
     set(LINUX_CXX_FLAGS_OK_G 1)
   endif()
   if ( CMAKE_CXX_FLAGS_RELEASE MATCHES .*-g.* )
     set(LINUX_CXX_FLAGS_OK_G 1)
   endif()
   if ( CMAKE_CXX_FLAGS MATCHES .*-g.* )
     set(LINUX_CXX_FLAGS_OK_G 1)
   endif()
 
   set (LINUX_C_FLAGS_OK_G 0)
   if ( CMAKE_C_FLAGS_DEBUG MATCHES .*-g.* )
     set(LINUX_C_FLAGS_OK_G 1)
   endif()
   if ( CMAKE_C_FLAGS_RELEASE MATCHES .*-g.* )
     set(LINUX_C_FLAGS_OK_G 1)
   endif()
   if ( CMAKE_C_FLAGS MATCHES .*-g.* )
     set(LINUX_C_FLAGS_OK_G 1)
   endif()
 
   if (NOT LINUX_CXX_FLAGS_OK_G)
     message(WARNING "When using the breakpad crash reporting module, you should use the -g flag in CMAKE_CXX_FLAGS (_RELEASE)")
   endif()
   if (NOT LINUX_C_FLAGS_OK_G)
     message(WARNING "When using the breakpad crash reporting module, you should use the -g flag in CMAKE_C_FLAGS (_RELEASE)")
   endif()
 
 
 endfunction()
 
 if(MITK_USE_BREAKPAD)
 
+  find_package(Breakpad)
+
   message(STATUS "Get directory hint for Breakpad:")
   message(STATUS ${Breakpad_DIR})
   message(STATUS ${Breakpad_SRC})
   # TODO this should be properly moved to some BreakpadConfig.cmake
   find_path(MITK_BREAKPAD_SRC_DIR breakpad_googletest_includes.h DOC  "Directory breakpad/src/" PATHS ${Breakpad_SRC}/src ${Breakpad_DIR})
   message(STATUS "Found Breakpad at:")
   message(STATUS ${MITK_BREAKPAD_SRC_DIR})
 
   if(CMAKE_SYSTEM MATCHES "Windows")
     checkWindowsCompilerFlags()
 
-    set(INCLUDE_DIRS_INTERNAL ${INCLUDE_DIRS_INTERNAL} ${MITK_BREAKPAD_SRC_DIR})
     set(ADDITIONAL_LIBS ${ADDITIONAL_LIBS}
       ${Breakpad_DIR}/Debug/breakpad_client.lib
 #      ${Breakpad_DIR}/Release/common.lib # ??
 #      ${Breakpad_DIR}/Release/crash_generation_client.lib # ???
 #      ${Breakpad_DIR}/Release/crash_generation_server.lib # out-of-process dump generator
 #      ${Breakpad_DIR}/Release/exception_handler.lib # dump creator (ExceptionHandler)
 #      ${Breakpad_DIR}/Release/crash_report_sender.lib
       ) # ??? unused, I guess
 
     set(EXECUTABLE_PROPERTY WIN32)
   elseif(CMAKE_SYSTEM MATCHES "Linux")
     checkLinuxCompilerFlags()
 
-    set(INCLUDE_DIRS_INTERNAL ${INCLUDE_DIRS_INTERNAL} ${MITK_BREAKPAD_SRC_DIR}) # TODO why the repetition, is INCLUDE_DIRS_INTERNAL not empty before??
     set(ADDITIONAL_LIBS ${ADDITIONAL_LIBS}
       ${Breakpad_DIR}/libbreakpad_client.a
       )
   else()
     message(FATAL_ERROR "Unsupported platform for Breakpad crash reporting: ${CMAKE_SYSTEM}")
   endif()
 
   message(STATUS "Building BreakpadCrashReporting module.")
-  message(STATUS "  Including ${INCLUDE_DIRS_INTERNAL}")
   message(STATUS "  Linking ${ADDITIONAL_LIBS}")
 
   MITK_CREATE_MODULE(BreakpadCrashReporting
-    INCLUDE_DIRS ${MITK_BIN_DIR}
-    INTERNAL_INCLUDE_DIRS ${INCLUDE_DIRS_INTERNAL}
-    DEPENDS Mitk Qmitk
+    INTERNAL_INCLUDE_DIRS ${Breakpad_INCLUDE_DIR}
     EXPORT_DEFINE MITK_BREAKPAD_EXPORT
     ADDITIONAL_LIBS ${ADDITIONAL_LIBS}
-    QT_MODULE
+    PACKAGE_DEPENDS QT
     )
 
   if(CMAKE_SYSTEM MATCHES "Windows")
     add_executable(CrashReportingServer ${EXECUTABLE_PROPERTY} mitkCrashReportingServer.cpp ${SERVER_MOC_CPP})
 
     target_link_libraries(CrashReportingServer ${ALL_LIBRARIES} ${QT_QTMAIN_LIBRARY} BreakpadCrashReporting)
   endif()
 
 add_subdirectory(Testing)
 
 endif(MITK_USE_BREAKPAD)