diff --git a/CMake/mitkMacroInstall.cmake b/CMake/mitkMacroInstall.cmake
index e9c4c7499b..53f84fb32d 100644
--- a/CMake/mitkMacroInstall.cmake
+++ b/CMake/mitkMacroInstall.cmake
@@ -1,125 +1,123 @@
 #
 # MITK specific install macro
 #
 # On Mac everything is installed for each bundle listed in MACOSX_BUNDLE_NAMES
 # by replacing the DESTINATION parameter. Everything else is passed to the CMake INSTALL command
 #
 # Usage: MITK_INSTALL( )
 #
 macro(MITK_INSTALL)
 
   set(ARGS ${ARGN})
  
   set(install_directories "")
   list(FIND ARGS DESTINATION _destination_index)
   # set(_install_DESTINATION "")
   if(_destination_index GREATER -1)
     message(SEND_ERROR "MITK_INSTALL macro must not be called with a DESTINATION parameter.")  
     ### This code was a try to replace a given DESTINATION
     #math(EXPR _destination_index ${_destination_index} + 1)
     #list(GET ARGS ${_destination_index} _install_DESTINATION)
     #string(REGEX REPLACE ^bin "" _install_DESTINATION ${_install_DESTINATION})
   else()
     if(NOT MACOSX_BUNDLE_NAMES)
       install(${ARGS} DESTINATION bin)
     else()
       foreach(bundle_name ${MACOSX_BUNDLE_NAMES})
         install(${ARGS} DESTINATION ${bundle_name}.app/Contents/MacOS/${_install_DESTINATION})
       endforeach()
     endif()
   endif()
 
 endmacro()
 
 # Fix _target_location
 # This is used in several install macros
 macro(_fixup_target)
 
   install(CODE "
     macro(gp_item_default_embedded_path_override item default_embedded_path_var)
       get_filename_component(_item_name \"\${item}\" NAME)
       get_filename_component(_item_path \"\${item}\" PATH)
 
       # We have to fix all path references to build trees for plugins
 
       if(NOT _item_path MATCHES \"\${CMAKE_INSTALL_PREFIX}/${_bundle_dest_dir}\")
         # item with relative path or embedded path pointing to some build dir
         set(full_path \"full_path-NOTFOUND\")
         file(GLOB_RECURSE full_path \${CMAKE_INSTALL_PREFIX}/${_bundle_dest_dir}/\${_item_name} )
         get_filename_component(_item_path \"\${full_path}\" PATH)
       endif()
       
       if(_item_path STREQUAL \"\${CMAKE_INSTALL_PREFIX}/${_bundle_dest_dir}/plugins\"
          OR _item_name MATCHES \"liborg\" # this is for legacy BlueBerry bundle support
         )
         # Only fix plugins
         message(\"override: \${item}\")
         message(\"found file: \${_item_path}/\${_item_name}\")
         if(APPLE)
           string(REPLACE 
                  \${CMAKE_INSTALL_PREFIX}/${_bundle_dest_dir} 
                  @executable_path \${default_embedded_path_var} \"\${_item_path}\" )
         else()
           set(\${default_embedded_path_var} \"\${_item_path}\")
         endif()
         message(\"override result: \${\${default_embedded_path_var}}\")        
       endif()
     endmacro(gp_item_default_embedded_path_override)
 
     macro(gp_resolved_file_type_override file type)
       if(NOT APPLE)
         get_filename_component(_file_path \"\${file}\" PATH)
         get_filename_component(_file_name \"\${file}\" NAME)
         if(_file_path MATCHES \"^\${CMAKE_INSTALL_PREFIX}\")
           set(\${type} \"local\")
         endif()
         if(_file_name MATCHES gdiplus)
             set(\${type} \"system\")
         endif(_file_name MATCHES gdiplus)
       endif()
     endmacro(gp_resolved_file_type_override)
 
-    if(NOT APPLE)
-      if(UNIX OR MINGW)
-        macro(gp_resolve_item_override context item exepath dirs resolved_item_var resolved_var)
-          if(\${item} MATCHES \"blueberry_osgi\")
-            get_filename_component(_item_name \${item} NAME)
-            set(\${resolved_item_var} \"\${exepath}/plugins/\${_item_name}\")
-            set(\${resolved_var} 1)
-          endif()
-        endmacro()
-      endif()
+    if(UNIX OR MINGW)
+      macro(gp_resolve_item_override context item exepath dirs resolved_item_var resolved_var)
+        if(\${item} MATCHES \"blueberry_osgi\")
+          get_filename_component(_item_name \${item} NAME)
+          set(\${resolved_item_var} \"\${exepath}/plugins/\${_item_name}\")
+          set(\${resolved_var} 1)
+        endif()
+      endmacro()
     endif()
 
     if(\"${_install_GLOB_PLUGINS}\" STREQUAL \"TRUE\") 
       file(GLOB_RECURSE GLOBBED_BLUEBERRY_PLUGINS
         # glob for all blueberry bundles of this application
         \"\${CMAKE_INSTALL_PREFIX}/${_bundle_dest_dir}/liborg*${CMAKE_SHARED_LIBRARY_SUFFIX}\")
     endif()
 
     file(GLOB_RECURSE GLOBBED_QT_PLUGINS
       # glob for Qt plugins
       \"\${CMAKE_INSTALL_PREFIX}/${${_target_location}_qt_plugins_install_dir}/plugins/*${CMAKE_SHARED_LIBRARY_SUFFIX}\")    
     
     # use custom version of BundleUtilities
     message(\"globbed plugins: \${GLOBBED_QT_PLUGINS} \${GLOBBED_BLUEBERRY_PLUGINS}\")
     set(PLUGIN_DIRS)
     set(PLUGINS ${_install_PLUGINS} \${GLOBBED_QT_PLUGINS} \${GLOBBED_BLUEBERRY_PLUGINS})
     if(PLUGINS)
       list(REMOVE_DUPLICATES PLUGINS)
     endif(PLUGINS)
     foreach(_plugin \${GLOBBED_BLUEBERRY_PLUGINS})
       get_filename_component(_pluginpath \${_plugin} PATH)
       list(APPEND PLUGIN_DIRS \${_pluginpath})
     endforeach(_plugin)
     set(DIRS ${DIRS})
     list(APPEND DIRS \${PLUGIN_DIRS})
     list(REMOVE_DUPLICATES DIRS)
 
     # use custom version of BundleUtilities
     set(CMAKE_MODULE_PATH ${MITK_SOURCE_DIR}/CMake ${CMAKE_MODULE_PATH} )
     include(BundleUtilities)
     
     fixup_bundle(\"\${CMAKE_INSTALL_PREFIX}/${_target_location}\" \"\${PLUGINS}\" \"\${DIRS}\")
   ")
 endmacro()