diff --git a/CMake/QBundleTemplate/BundleDefaults.cmake b/CMake/QBundleTemplate/BundleDefaults.cmake
index 8982dfceb5..d24bd3aad9 100644
--- a/CMake/QBundleTemplate/BundleDefaults.cmake
+++ b/CMake/QBundleTemplate/BundleDefaults.cmake
@@ -1,30 +1,29 @@
 set(BUNDLE_NAMESPACE "")
 set(DEFAULT_REQUIRED_BUNDLES "org.mitk.core.services")
 set(DEFAULT_REQUIRED_BUNDLES_FOR_GUI "org.mitk.gui.qt.common")
 set(DEFAULT_PLUGIN_VERSION "0.1")
 set(DEFAULT_PLUGIN_VENDOR "DKFZ, Medical and Biological Informatics")
 set(DEFAULT_VIEW_BASEID "org.mitk.views.")
 set(DEFAULT_VIEW_CLASS_BEGIN "Qmitk")
 set(DEFAULT_VIEW_BASE_CLASS "QmitkFunctionality")
 set(DEFAULT_VIEW_BASE_CLASS_H "QmitkFunctionality.h")
 set(PROJECT_STATIC_VAR "MITK_STATIC")
 set(DOXYGEN_INGROUP "MITKPlugins")
 set(DEFAULT_CREATE_PLUGIN_MACRO "MACRO_CREATE_MITK_PLUGIN()")
 set(DEFAULT_CREATE_GUI_PLUGIN_MACRO "MACRO_CREATE_MITK_PLUGIN(QmitkExt)")
-set(PLUGIN_COPYRIGHT "/*=========================================================================
+set(PLUGIN_COPYRIGHT "/*===================================================================
 
-Program:   Medical Imaging & Interaction Toolkit
-Language:  C++
-Date:      $Date$
-Version:   $Revision: 16706 $ 
- 
-Copyright (c) German Cancer Research Center, Division of Medical and
-Biological Informatics. All rights reserved.
-See MITKCopyright.txt or http://www.mitk.org/copyright.html for details.
+The Medical Imaging Interaction Toolkit (MITK)
 
-This software is distributed WITHOUT ANY WARRANTY; without even
-the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-PURPOSE.  See the above copyright notices for more information.
+Copyright (c) German Cancer Research Center, 
+Division of Medical and Biological Informatics.
+All rights reserved.
 
-=========================================================================*/")
+This software is distributed WITHOUT ANY WARRANTY; without 
+even the implied warranty of MERCHANTABILITY or FITNESS FOR 
+A PARTICULAR PURPOSE.
+
+See LICENSE.txt or http://www.mitk.org for details.
+
+===================================================================*/")
 
diff --git a/CMake/moduleExports.h.in b/CMake/moduleExports.h.in
index 34ec3993df..4fc81d8da9 100644
--- a/CMake/moduleExports.h.in
+++ b/CMake/moduleExports.h.in
@@ -1,50 +1,49 @@
-/*=========================================================================
+/*===================================================================
 
-Program:   Medical Imaging & Interaction Toolkit
-Language:  C++
-Date:      $Date: 2009-05-19 21:14:21 +0200 (Di, 19 Mai 2009) $
-Version:   $Revision: 17326 $
+The Medical Imaging Interaction Toolkit (MITK)
 
-Copyright (c) German Cancer Research Center, Division of Medical and
-Biological Informatics. All rights reserved.
-See MITKCopyright.txt or http://www.mitk.org/copyright.html for details.
+Copyright (c) German Cancer Research Center, 
+Division of Medical and Biological Informatics.
+All rights reserved.
 
-This software is distributed WITHOUT ANY WARRANTY; without even
-the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-PURPOSE.  See the above copyright notices for more information.
+This software is distributed WITHOUT ANY WARRANTY; without 
+even the implied warranty of MERCHANTABILITY or FITNESS FOR 
+A PARTICULAR PURPOSE.
 
-=========================================================================*/
+See LICENSE.txt or http://www.mitk.org for details.
+
+===================================================================*/
 
 #include <mitkExportMacros.h>
 
 #ifndef @MODULE_NAME@_EXPORTS_H
   #define @MODULE_NAME@_EXPORTS_H
 
   /**
    * provide a macro for adding compiler specific export/import declarations
    * to classes.
    *  This is needed for the export of symbols, when you build a DLL. Then write
    *
    *    class @MODULE_EXPORT_DEFINE@ ClassName : public SomeClass {};
    */
   #ifdef MITK_BUILD_STATIC
     #define @MODULE_EXPORT_DEFINE@
     #define @MODULE_NAME@_LOCAL
   #else
     #ifdef @MODULE_PROVIDES@_EXPORTS
       #define @MODULE_EXPORT_DEFINE@ MITK_EXPORT
     #else
       #define @MODULE_EXPORT_DEFINE@ MITK_IMPORT
     #endif
     #define @MODULE_NAME@_LOCAL MITK_LOCAL
   #endif
 
   #ifndef _CMAKE_MODULENAME
     #ifdef @MODULE_PROVIDES@_EXPORTS
       #define _CMAKE_MODULENAME "@MODULE_NAME@"
     #endif
   #endif
 
 #endif