diff --git a/Applications/mitkDiffusion/CPackOptions.cmake b/Applications/mitkDiffusion/CPackOptions.cmake
index 00f68c0927..99ec74a0f4 100644
--- a/Applications/mitkDiffusion/CPackOptions.cmake
+++ b/Applications/mitkDiffusion/CPackOptions.cmake
@@ -1,26 +1,18 @@
 # Set Diffusion specific CPack options
 
 set(CPACK_PACKAGE_EXECUTABLES "mitkDiffusion;MITK Diffusion")
 set(CPACK_PACKAGE_NAME "MITK-Diffusion")
 set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "MITK application for processing of MR diffusion imaging data.")
 # Major version is the year of release
 set(CPACK_PACKAGE_VERSION_MAJOR "2012")
 # Minor version is assigned depending on the number of releases that year, order is "", "a", "b"..., "z"
 set(CPACK_PACKAGE_VERSION_MINOR "")
 # Patch versioning is not intended to be done
 set(CPACK_PACKAGE_VERSION_PATCH "")
 
 # this should result in names like 2011, 2011a, ...
 # version has to be set explicitly to avoid such things as CMake creating the install directory "MITK Diffusion 2011.."
 set(CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}${CPACK_PACKAGE_VERSION_MINOR}")
 
-if(CMAKE_CL_64)
-  set(CPACK_PACKAGE_FILE_NAME "MITK-Diffusion-${CPACK_PACKAGE_VERSION}-win64")
-elseif(MINGW)
-  set(CPACK_PACKAGE_FILE_NAME "MITK-Diffusion-${CPACK_PACKAGE_VERSION}-mingw32")
-elseif(WIN32)
-  set(CPACK_PACKAGE_FILE_NAME "MITK-Diffusion-${CPACK_PACKAGE_VERSION}-win32")
-else()
-  set(CPACK_PACKAGE_FILE_NAME "MITK-Diffusion-${CPACK_PACKAGE_VERSION}")
-endif()
+set(CPACK_PACKAGE_FILE_NAME "MITK-Diffusion-${CPACK_PACKAGE_VERSION}-${CPACK_PACKAGE_ARCH}")
 
diff --git a/Applications/mitkWorkbench/CPackOptions.cmake b/Applications/mitkWorkbench/CPackOptions.cmake
deleted file mode 100644
index 06935ce197..0000000000
--- a/Applications/mitkWorkbench/CPackOptions.cmake
+++ /dev/null
@@ -1,38 +0,0 @@
-# Set MITK Workbench specific CPack options
-
-# set version
-set(CPACK_PACKAGE_VERSION
-  "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
-
-# determine possible system specific extension
-set(extension "unkown-architecture")
-
-if(${CMAKE_SYSTEM_NAME} MATCHES Windows)
-  if(CMAKE_CL_64)
-    set(extension "win64")
-  elseif(MINGW)
-    set(extension "mingw32")
-  elseif(WIN32)
-    set(extension "win32")
-  endif()
-endif(${CMAKE_SYSTEM_NAME} MATCHES Windows)
-
-if(${CMAKE_SYSTEM_NAME} MATCHES Linux)
-  if(${CMAKE_SYSTEM_PROCESSOR} MATCHES i686)
-    set(extension "linux32")
-  elseif(${CMAKE_SYSTEM_PROCESSOR} MATCHES x86_64)
-    if(${CMAKE_CXX_FLAGS} MATCHES " -m32 ")
-      set(extension "linux32")
-    else()
-      set(extension "linux64")
-    endif(${CMAKE_CXX_FLAGS} MATCHES " -m32 ")
-  else()
-    set(extension "linux")
-  endif()
-endif(${CMAKE_SYSTEM_NAME} MATCHES Linux)
-
-if(${CMAKE_SYSTEM_NAME} MATCHES Darwin)
-  set(extension "mac64")
-endif(${CMAKE_SYSTEM_NAME} MATCHES Darwin)
-
-set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-${extension}")
diff --git a/CMake/mitkSetupCPack.cmake b/CMake/mitkSetupCPack.cmake
index d39eec1ecd..1f27599d33 100644
--- a/CMake/mitkSetupCPack.cmake
+++ b/CMake/mitkSetupCPack.cmake
@@ -1,67 +1,104 @@
 #
 # First, set the generator variable
 #
 if(NOT CPACK_GENERATOR)
   if(WIN32)
     find_program(NSIS_MAKENSIS NAMES makensis
       PATHS [HKEY_LOCAL_MACHINE\\SOFTWARE\\NSIS]
       DOC "Where is makensis.exe located"
       )
 
     if(NOT NSIS_MAKENSIS)
       set(CPACK_GENERATOR ZIP)
     else()
       set(CPACK_GENERATOR "NSIS;ZIP")
       
     endif(NOT NSIS_MAKENSIS)
   else()
     if(APPLE)
       set(CPACK_GENERATOR DragNDrop)
     else()
       set(CPACK_GENERATOR TGZ)
     endif()
   endif()
 endif(NOT CPACK_GENERATOR)
 
 # On windows set default install directory appropriately for 32 and 64 bit 
 # installers if not already set
 if(WIN32 AND NOT CPACK_NSIS_INSTALL_ROOT)
   if(CMAKE_CL_64) 
     set(CPACK_NSIS_INSTALL_ROOT "$PROGRAMFILES64") 
   else()
     set(CPACK_NSIS_INSTALL_ROOT "$PROGRAMFILES") 
   endif()
 endif()
 
 # include required mfc libraries
 include(InstallRequiredSystemLibraries)
 
 set(CPACK_PACKAGE_NAME "MITK")
 set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "MITK is a medical image processing tool")
 set(CPACK_PACKAGE_VENDOR "German Cancer Research Center (DKFZ)")
 set(CPACK_PACKAGE_DESCRIPTION_FILE "${MITK_SOURCE_DIR}/LICENSE.txt")
 set(CPACK_RESOURCE_FILE_LICENSE "${MITK_SOURCE_DIR}/LICENSE.txt")
 set(CPACK_PACKAGE_VERSION_MAJOR "${MITK_VERSION_MAJOR}")
 set(CPACK_PACKAGE_VERSION_MINOR "${MITK_VERSION_MINOR}")
 
 # tell cpack to strip all debug symbols from all files
 set(CPACK_STRIP_FILES ON)
 
 # append revision number if available
 if(MITK_REVISION_ID AND MITK_VERSION_PATCH STREQUAL "99")
   if(MITK_WC_TYPE STREQUAL "git")
     set(git_hash ${MITK_REVISION_ID})
     string(LENGTH "${git_hash}" hash_length)
     if(hash_length GREATER 6)
       string(SUBSTRING ${git_hash} 0 6 git_hash)
     endif()
     set(CPACK_PACKAGE_VERSION_PATCH "${MITK_VERSION_PATCH}_r${git_hash}")
   else()
     set(CPACK_PACKAGE_VERSION_PATCH "${MITK_VERSION_PATCH}_r${MITK_REVISION_ID}")
   endif()
 else()
   set(CPACK_PACKAGE_VERSION_PATCH "${MITK_VERSION_PATCH}")
 endif()
 
+# set version
+set(CPACK_PACKAGE_VERSION
+  "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
+
+# determine possible system specific extension
+set(CPACK_PACKAGE_ARCH "unkown-architecture")
+
+if(${CMAKE_SYSTEM_NAME} MATCHES Windows)
+  if(CMAKE_CL_64)
+    set(CPACK_PACKAGE_ARCH "win64")
+  elseif(MINGW)
+    set(CPACK_PACKAGE_ARCH "mingw32")
+  elseif(WIN32)
+    set(CPACK_PACKAGE_ARCH "win32")
+  endif()
+endif(${CMAKE_SYSTEM_NAME} MATCHES Windows)
+
+if(${CMAKE_SYSTEM_NAME} MATCHES Linux)
+  if(${CMAKE_SYSTEM_PROCESSOR} MATCHES i686)
+    set(CPACK_PACKAGE_ARCH "linux32")
+  elseif(${CMAKE_SYSTEM_PROCESSOR} MATCHES x86_64)
+    if(${CMAKE_CXX_FLAGS} MATCHES " -m32 ")
+      set(CPACK_PACKAGE_ARCH "linux32")
+    else()
+      set(CPACK_PACKAGE_ARCH "linux64")
+    endif(${CMAKE_CXX_FLAGS} MATCHES " -m32 ")
+  else()
+    set(CPACK_PACKAGE_ARCH "linux")
+  endif()
+endif(${CMAKE_SYSTEM_NAME} MATCHES Linux)
+
+if(${CMAKE_SYSTEM_NAME} MATCHES Darwin)
+  set(CPACK_PACKAGE_ARCH "mac64")
+endif(${CMAKE_SYSTEM_NAME} MATCHES Darwin)
+
+set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-${CPACK_PACKAGE_ARCH}")
+