diff --git a/Modules/Bundles/org.mitk.gui.qt.measurement/CMakeLists.txt b/Modules/Bundles/org.mitk.gui.qt.measurement/CMakeLists.txt
index 32a071389f..3d755b18bc 100644
--- a/Modules/Bundles/org.mitk.gui.qt.measurement/CMakeLists.txt
+++ b/Modules/Bundles/org.mitk.gui.qt.measurement/CMakeLists.txt
@@ -1 +1,9 @@
-MACRO_CREATE_MITK_PLUGIN(QmitkExt PlanarFigure)
+# The project name must correspond to the directory name of your plug-in
+# and must not contain periods.
+PROJECT(org_mitk_gui_qt_measurement)
+
+MACRO_CREATE_MITK_CTK_PLUGIN(
+  EXPORT_DIRECTIVE MITK_QT_MEASUREMENT
+  EXPORTED_INCLUDE_SUFFIXES src
+  MODULE_DEPENDENCIES QmitkExt PlanarFigure
+)
\ No newline at end of file
diff --git a/Modules/Bundles/org.mitk.gui.qt.measurement/files.cmake b/Modules/Bundles/org.mitk.gui.qt.measurement/files.cmake
index 1d71c262ce..720871527d 100644
--- a/Modules/Bundles/org.mitk.gui.qt.measurement/files.cmake
+++ b/Modules/Bundles/org.mitk.gui.qt.measurement/files.cmake
@@ -1,45 +1,48 @@
 SET(SRC_CPP_FILES
   
 )
 
 SET(INTERNAL_CPP_FILES
   QmitkMeasurement.cpp
   QmitkPlanarFiguresTableModel.cpp
+  src/internal/mitkPluginActivator.cpp
 )
 
 SET(UI_FILES
 )
 
 SET(MOC_H_FILES
   src/internal/QmitkMeasurement.h
   src/internal/QmitkPlanarFiguresTableModel.h
+  src/internal/mitkPluginActivator.h
 )
 
-SET(RESOURCE_FILES
+SET(CACHED_RESOURCE_FILES
   resources/measurement.png
   resources/angle.png
   resources/arrow.png
   resources/circle.png
   resources/four-point-angle.png
   resources/line.png
   resources/measurement.png
   resources/path.png
   resources/polygon.png
   resources/rectangle.png
   resources/text.png
+  plugin.xml
 )
 
-SET(RES_FILES
+SET(QRC_FILES
   resources/measurement.qrc
 )
 
 
-SET(CPP_FILES manifest.cpp)
+SET(CPP_FILES )
 
 foreach(file ${SRC_CPP_FILES})
   SET(CPP_FILES ${CPP_FILES} src/${file})
 endforeach(file ${SRC_CPP_FILES})
 
 foreach(file ${INTERNAL_CPP_FILES})
   SET(CPP_FILES ${CPP_FILES} src/internal/${file})
 endforeach(file ${INTERNAL_CPP_FILES})
diff --git a/Modules/Bundles/org.mitk.gui.qt.measurement/manifest_headers.cmake b/Modules/Bundles/org.mitk.gui.qt.measurement/manifest_headers.cmake
new file mode 100644
index 0000000000..c8a83a7f96
--- /dev/null
+++ b/Modules/Bundles/org.mitk.gui.qt.measurement/manifest_headers.cmake
@@ -0,0 +1,5 @@
+set(Plugin-Name "Measurement")
+set(Plugin-Version "1.0.0)
+set(Plugin-Vendor "DKFZ, Medical and Biological Informatics")
+set(Plugin-ContactAddress "http://www.mitk.org")
+set(Require-Plugin org.mitk.gui.qt.common)
\ No newline at end of file
diff --git a/Modules/Bundles/org.mitk.gui.qt.measurement/src/internal/mitkPluginActivator.cpp b/Modules/Bundles/org.mitk.gui.qt.measurement/src/internal/mitkPluginActivator.cpp
new file mode 100644
index 0000000000..4ce096b1ca
--- /dev/null
+++ b/Modules/Bundles/org.mitk.gui.qt.measurement/src/internal/mitkPluginActivator.cpp
@@ -0,0 +1,19 @@
+#include "mitkPluginActivator.h"
+
+#include <QtPlugin>
+
+namespace mitk {
+
+void PluginActivator::start(ctkPluginContext* context)
+{
+  Q_UNUSED(context)
+}
+
+void PluginActivator::stop(ctkPluginContext* context)
+{
+  Q_UNUSED(context)
+}
+
+}
+
+Q_EXPORT_PLUGIN2(org.mitk.gui.qt.measurement, mitk::PluginActivator)
\ No newline at end of file
diff --git a/Modules/Bundles/org.mitk.gui.qt.measurement/src/internal/mitkPluginActivator.h b/Modules/Bundles/org.mitk.gui.qt.measurement/src/internal/mitkPluginActivator.h
new file mode 100644
index 0000000000..70c968b98e
--- /dev/null
+++ b/Modules/Bundles/org.mitk.gui.qt.measurement/src/internal/mitkPluginActivator.h
@@ -0,0 +1,23 @@
+#ifndef MITKPLUGINACTIVATOR_H
+#define MITKPLUGINACTIVATOR_H
+
+#include <ctkPluginActivator.h>
+
+namespace mitk {
+
+class PluginActivator :
+  public QObject, public ctkPluginActivator
+{
+  Q_OBJECT
+  Q_INTERFACES(ctkPluginActivator)
+
+public:
+
+  void start(ctkPluginContext* context);
+  void stop(ctkPluginContext* context);
+
+}; // PluginActivator
+
+}
+
+#endif // MITKPLUGINACTIVATOR_H
\ No newline at end of file