diff --git a/java/com.sap.sailing.feature.p2build/raceanalysis.product b/java/com.sap.sailing.feature.p2build/raceanalysis.product
index 31a91d724db..cde6b86e74b 100755
--- a/java/com.sap.sailing.feature.p2build/raceanalysis.product
+++ b/java/com.sap.sailing.feature.p2build/raceanalysis.product
@@ -39,6 +39,7 @@
       <plugin id="com.sap.sailing.freg.resultimport" autoStart="true" startLevel="3" />
       <plugin id="com.sap.sailing.gwt.ui" autoStart="true" startLevel="4" />
       <plugin id="com.sap.sailing.kiworesultimport" autoStart="true" startLevel="3" />
+      <plugin id="com.sap.sailing.manage2sail.resultimport" autoStart="true" startLevel="3" />
       <plugin id="com.sap.sailing.monitoring" autoStart="true" startLevel="5" />
       <plugin id="com.sap.sailing.resultimport" autoStart="true" startLevel="3" />
       <plugin id="com.sap.sailing.server" autoStart="true" startLevel="4" />
diff --git a/java/com.sap.sailing.feature/feature.xml b/java/com.sap.sailing.feature/feature.xml
index a6376e4424f..b393665ca29 100755
--- a/java/com.sap.sailing.feature/feature.xml
+++ b/java/com.sap.sailing.feature/feature.xml
@@ -251,6 +251,13 @@ Computes leaderboard information for sailing races and offers RESTful APIs to al
          version="0.0.0"
          unpack="false"/>
 
+   <plugin
+         id="com.sap.sailing.manage2sail.resultimport"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+         
    <plugin
          id="com.sap.sailing.velum.resultimport"
          download-size="0"
diff --git a/java/com.sap.sailing.manage2sail.resultimport.test/.classpath b/java/com.sap.sailing.manage2sail.resultimport.test/.classpath
new file mode 100644
index 00000000000..a14ade4efd3
--- /dev/null
+++ b/java/com.sap.sailing.manage2sail.resultimport.test/.classpath
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="resources"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/java/com.sap.sailing.manage2sail.resultimport.test/.gitignore b/java/com.sap.sailing.manage2sail.resultimport.test/.gitignore
new file mode 100644
index 00000000000..f922755ad7a
--- /dev/null
+++ b/java/com.sap.sailing.manage2sail.resultimport.test/.gitignore
@@ -0,0 +1,2 @@
+bin/
+/bin
diff --git a/java/com.sap.sailing.manage2sail.resultimport.test/.project b/java/com.sap.sailing.manage2sail.resultimport.test/.project
new file mode 100644
index 00000000000..8f4948ee364
--- /dev/null
+++ b/java/com.sap.sailing.manage2sail.resultimport.test/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>com.sap.sailing.manage2sail.resultimport.test</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/java/com.sap.sailing.manage2sail.resultimport.test/.settings/org.eclipse.jdt.core.prefs b/java/com.sap.sailing.manage2sail.resultimport.test/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 00000000000..f42de363afa
--- /dev/null
+++ b/java/com.sap.sailing.manage2sail.resultimport.test/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.7
diff --git a/java/com.sap.sailing.manage2sail.resultimport.test/.settings/org.eclipse.pde.core.prefs b/java/com.sap.sailing.manage2sail.resultimport.test/.settings/org.eclipse.pde.core.prefs
new file mode 100644
index 00000000000..f29e940a005
--- /dev/null
+++ b/java/com.sap.sailing.manage2sail.resultimport.test/.settings/org.eclipse.pde.core.prefs
@@ -0,0 +1,3 @@
+eclipse.preferences.version=1
+pluginProject.extensions=false
+resolve.requirebundle=false
diff --git a/java/com.sap.sailing.manage2sail.resultimport.test/META-INF/MANIFEST.MF b/java/com.sap.sailing.manage2sail.resultimport.test/META-INF/MANIFEST.MF
new file mode 100644
index 00000000000..ee506210c09
--- /dev/null
+++ b/java/com.sap.sailing.manage2sail.resultimport.test/META-INF/MANIFEST.MF
@@ -0,0 +1,15 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Manage2Sail result import tests
+Bundle-SymbolicName: com.sap.sailing.manage2sail.resultimport.test
+Bundle-Version: 1.0.0.qualifier
+Bundle-Activator: com.sap.sailing.manage2sail.resultimport.test.Activator
+Bundle-Vendor: SAP
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Import-Package: org.osgi.framework;version="1.5.0"
+Bundle-ActivationPolicy: lazy
+Require-Bundle: org.junit4;bundle-version="4.8.2",
+ com.sap.sailing.manage2sail.resultimport,
+ com.sap.sailing.domain.common,
+ com.sap.sailing.domain,
+ com.sap.sailing.resultimport
diff --git a/java/com.sap.sailing.manage2sail.resultimport.test/build.properties b/java/com.sap.sailing.manage2sail.resultimport.test/build.properties
new file mode 100644
index 00000000000..f11210d3f2c
--- /dev/null
+++ b/java/com.sap.sailing.manage2sail.resultimport.test/build.properties
@@ -0,0 +1,5 @@
+source.. = src/,\
+           resources/
+output.. = bin/
+bin.includes = META-INF/,\
+               .
diff --git a/java/com.sap.sailing.manage2sail.resultimport.test/pom.xml b/java/com.sap.sailing.manage2sail.resultimport.test/pom.xml
new file mode 100644
index 00000000000..096ff47fc5f
--- /dev/null
+++ b/java/com.sap.sailing.manage2sail.resultimport.test/pom.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <artifactId>root</artifactId>
+    <groupId>com.sap.sailing</groupId>
+    <version>1.0.0-SNAPSHOT</version>
+  </parent>
+  <artifactId>com.sap.sailing.manage2sail.resultimport.test</artifactId>
+  <packaging>eclipse-test-plugin</packaging>
+</project>
diff --git a/java/com.sap.sailing.manage2sail.resultimport.test/src/com/sap/sailing/manage2sail/resultimport/test/Activator.java b/java/com.sap.sailing.manage2sail.resultimport.test/src/com/sap/sailing/manage2sail/resultimport/test/Activator.java
new file mode 100644
index 00000000000..cd37adf3ba8
--- /dev/null
+++ b/java/com.sap.sailing.manage2sail.resultimport.test/src/com/sap/sailing/manage2sail/resultimport/test/Activator.java
@@ -0,0 +1,30 @@
+package com.sap.sailing.manage2sail.resultimport.test;
+
+import org.osgi.framework.BundleActivator;
+import org.osgi.framework.BundleContext;
+
+public class Activator implements BundleActivator {
+
+	private static BundleContext context;
+
+	static BundleContext getContext() {
+		return context;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext)
+	 */
+	public void start(BundleContext bundleContext) throws Exception {
+		Activator.context = bundleContext;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext)
+	 */
+	public void stop(BundleContext bundleContext) throws Exception {
+		Activator.context = null;
+	}
+
+}
diff --git a/java/com.sap.sailing.manage2sail.resultimport/.classpath b/java/com.sap.sailing.manage2sail.resultimport/.classpath
new file mode 100644
index 00000000000..098194ca4b7
--- /dev/null
+++ b/java/com.sap.sailing.manage2sail.resultimport/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/java/com.sap.sailing.manage2sail.resultimport/.gitignore b/java/com.sap.sailing.manage2sail.resultimport/.gitignore
new file mode 100644
index 00000000000..e660fd93d31
--- /dev/null
+++ b/java/com.sap.sailing.manage2sail.resultimport/.gitignore
@@ -0,0 +1 @@
+bin/
diff --git a/java/com.sap.sailing.manage2sail.resultimport/.project b/java/com.sap.sailing.manage2sail.resultimport/.project
new file mode 100644
index 00000000000..a2606335bd9
--- /dev/null
+++ b/java/com.sap.sailing.manage2sail.resultimport/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>com.sap.sailing.manage2sail.resultimport</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/java/com.sap.sailing.manage2sail.resultimport/.settings/org.eclipse.jdt.core.prefs b/java/com.sap.sailing.manage2sail.resultimport/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 00000000000..f42de363afa
--- /dev/null
+++ b/java/com.sap.sailing.manage2sail.resultimport/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.7
diff --git a/java/com.sap.sailing.manage2sail.resultimport/.settings/org.eclipse.pde.core.prefs b/java/com.sap.sailing.manage2sail.resultimport/.settings/org.eclipse.pde.core.prefs
new file mode 100644
index 00000000000..f29e940a005
--- /dev/null
+++ b/java/com.sap.sailing.manage2sail.resultimport/.settings/org.eclipse.pde.core.prefs
@@ -0,0 +1,3 @@
+eclipse.preferences.version=1
+pluginProject.extensions=false
+resolve.requirebundle=false
diff --git a/java/com.sap.sailing.manage2sail.resultimport/META-INF/MANIFEST.MF b/java/com.sap.sailing.manage2sail.resultimport/META-INF/MANIFEST.MF
new file mode 100644
index 00000000000..4f424eb8106
--- /dev/null
+++ b/java/com.sap.sailing.manage2sail.resultimport/META-INF/MANIFEST.MF
@@ -0,0 +1,15 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Manage2Sail Result import
+Bundle-SymbolicName: com.sap.sailing.manage2sail.resultimport
+Bundle-Version: 1.0.0.qualifier
+Bundle-Activator: com.sap.sailing.manage2sail.resultimport.Activator
+Bundle-Vendor: SAP
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Import-Package: org.osgi.framework;version="1.5.0"
+Bundle-ActivationPolicy: lazy
+Require-Bundle: com.sap.sailing.server,
+ com.sap.sailing.domain.common,
+ com.sap.sailing.domain,
+ com.sap.sailing.resultimport,
+ com.sap.sailing.xrr.resultimport
diff --git a/java/com.sap.sailing.manage2sail.resultimport/build.properties b/java/com.sap.sailing.manage2sail.resultimport/build.properties
new file mode 100644
index 00000000000..34d2e4d2dad
--- /dev/null
+++ b/java/com.sap.sailing.manage2sail.resultimport/build.properties
@@ -0,0 +1,4 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .
diff --git a/java/com.sap.sailing.manage2sail.resultimport/pom.xml b/java/com.sap.sailing.manage2sail.resultimport/pom.xml
new file mode 100644
index 00000000000..3314ac896b0
--- /dev/null
+++ b/java/com.sap.sailing.manage2sail.resultimport/pom.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <artifactId>root</artifactId>
+    <groupId>com.sap.sailing</groupId>
+    <version>1.0.0-SNAPSHOT</version>
+  </parent>
+  <artifactId>com.sap.sailing.manage2sail.resultimport</artifactId>
+  <packaging>eclipse-plugin</packaging>
+</project>
diff --git a/java/com.sap.sailing.manage2sail.resultimport/src/com/sap/sailing/manage2sail/resultimport/Activator.java b/java/com.sap.sailing.manage2sail.resultimport/src/com/sap/sailing/manage2sail/resultimport/Activator.java
new file mode 100644
index 00000000000..62314427b41
--- /dev/null
+++ b/java/com.sap.sailing.manage2sail.resultimport/src/com/sap/sailing/manage2sail/resultimport/Activator.java
@@ -0,0 +1,30 @@
+package com.sap.sailing.manage2sail.resultimport;
+
+import org.osgi.framework.BundleActivator;
+import org.osgi.framework.BundleContext;
+
+public class Activator implements BundleActivator {
+
+	private static BundleContext context;
+
+	static BundleContext getContext() {
+		return context;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext)
+	 */
+	public void start(BundleContext bundleContext) throws Exception {
+		Activator.context = bundleContext;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext)
+	 */
+	public void stop(BundleContext bundleContext) throws Exception {
+		Activator.context = null;
+	}
+
+}
diff --git a/java/pom.xml b/java/pom.xml
index 68788df6515..4b777a36280 100755
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -78,6 +78,8 @@
 		<module>com.sap.sailing.velum.resultimport.test</module>
 		<module>com.sap.sailing.sailwave.resultimport</module>
 		<module>com.sap.sailing.sailwave.resultimport.test</module>
+		<module>com.sap.sailing.manage2sail.resultimport</module>
+		<module>com.sap.sailing.manage2sail.resultimport.test</module>
 		<module>com.sap.sailing.selenium.test</module>
 		<module>org.openqa.selenium.osgi</module>
 		<module>com.sap.sailing.monitoring</module>