diff --git a/org.jcryptool.crypto.keystore/META-INF/MANIFEST.MF b/org.jcryptool.crypto.keystore/META-INF/MANIFEST.MF
index 1a2afd3bfd..93cd5da0e3 100644
--- a/org.jcryptool.crypto.keystore/META-INF/MANIFEST.MF
+++ b/org.jcryptool.crypto.keystore/META-INF/MANIFEST.MF
@@ -10,7 +10,7 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.core.filesystem,
  net.sourceforge.codec;bundle-version="1.7.0",
  de.flexiprovider;bundle-version="1.7.0", 
- org.jcryptool.thirdparty.java11migration.jaxb
+ org.jcryptool.thirdparty.m2bundle.jaxb
 Bundle-ActivationPolicy: lazy
 Export-Package: org.jcryptool.crypto.keystore,
  org.jcryptool.crypto.keystore.backend,
diff --git a/org.jcryptool.jre.master.feature/build.properties b/org.jcryptool.jre.master.feature/build.properties
new file mode 100644
index 0000000000..82ab19c62d
--- /dev/null
+++ b/org.jcryptool.jre.master.feature/build.properties
@@ -0,0 +1 @@
+bin.includes = feature.xml
diff --git a/org.jcryptool.jre.master.feature/feature.xml b/org.jcryptool.jre.master.feature/feature.xml
new file mode 100644
index 0000000000..83af6cfcca
--- /dev/null
+++ b/org.jcryptool.jre.master.feature/feature.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.jcryptool.jre.master.feature"
+      label="OpenJDK/JLink JRE"
+      version="1.0.0">
+
+   <description>
+      Aggregates the JRE features from org.jcryptool.thirdparty.jre
+   </description>
+
+   <copyright>
+      No copyright is assumend by JCrypTool nor its maintaines for the JRE. Please refer to the information provided with the individual jre features. 
+   </copyright>
+
+   <license>
+      The license under which the OpenJDK JRE is distributed stays untouched. Please refer to the information provided with the individual jre features.
+   </license>
+
+   <includes
+         id="org.jcryptool.thirdparty.jre.linux64.feature"
+         version="11.0.4.qualifier"
+         optional="true"
+         os="linux"
+         ws="gtk"
+         arch="x86_64"/>
+
+   <includes
+         id="org.jcryptool.thirdparty.jre.win64.feature"
+         version="11.0.4.qualifier"
+         optional="true"
+         os="win32"
+         ws="win32"
+         arch="x86_64"/>
+
+   <includes
+         id="org.jcryptool.thirdparty.jre.macosx.feature"
+         version="11.0.4.qualifier"
+         optional="true"
+         os="macosx"
+         ws="cocoa"
+         arch="x86_64"/>
+
+</feature>
diff --git a/org.jcryptool.jre.master.feature/pom.xml b/org.jcryptool.jre.master.feature/pom.xml
new file mode 100644
index 0000000000..0cf8c60d8e
--- /dev/null
+++ b/org.jcryptool.jre.master.feature/pom.xml
@@ -0,0 +1,13 @@
+<?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">
+	<parent>
+		<groupId>org.jcryptool</groupId>
+		<artifactId>org.jcryptool.core.parent</artifactId>
+		<version>1.0.0</version>
+	</parent>
+	<modelVersion>4.0.0</modelVersion>
+	<artifactId>org.jcryptool.jre.master.feature</artifactId>
+	<packaging>eclipse-feature</packaging>
+</project>
diff --git a/org.jcryptool.target/org.jcryptool.target.target b/org.jcryptool.target/org.jcryptool.target.target
index df27a485d7..8ca16b061f 100644
--- a/org.jcryptool.target/org.jcryptool.target.target
+++ b/org.jcryptool.target/org.jcryptool.target.target
@@ -19,9 +19,19 @@
 		<unit id="org.eclipse.rcp.sdk.id" version="4.13.0.I20190916-1045"/>
 		<unit id="org.eclipse.zest.sdk.feature.group" version="1.7.0.201606061308"/>
 	</location>
-	<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="false" type="InstallableUnit">
+<!--	<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="false" type="InstallableUnit">
 		<repository location="https://simlei.github.io/org.jcryptool.thirdparty.java11migration.p2/site"/>
 		<unit id="org.jcryptool.thirdparty.java11migration.jaxb" version="0.0.1.20190910205836"/>
+	</location>-->
+	<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="false" type="InstallableUnit">
+		<repository location="https://simlei.github.io/org.jcryptool.thirdparty/site/m2bundle"/>
+		<unit id="org.jcryptool.thirdparty.m2bundle.jaxb" version="0.0.1.20191016062250"/>
+	</location>
+	<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="false" type="InstallableUnit">
+		<repository location="https://simlei.github.io/org.jcryptool.thirdparty/site/jre"/>
+		<unit id="org.jcryptool.thirdparty.jre.linux64.feature.feature.group" version="11.0.4.201910160422"/>
+		<unit id="org.jcryptool.thirdparty.jre.macosx.feature.feature.group" version="11.0.4.201910160422"/>
+		<unit id="org.jcryptool.thirdparty.jre.win64.feature.feature.group" version="11.0.4.201910160422"/>
 	</location>
 </locations>
 <launcherArgs>
diff --git a/pom.xml b/pom.xml
index 57c7ecc8ac..6df9a2a1f6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -55,13 +55,13 @@
     <module>org.jcryptool.editors.feature</module>
     <module>org.jcryptool.fileexplorer</module>
 	<module>org.jcryptool.jre.master.feature</module>
-	<module>org.jcryptool.jre.macosx.feature</module>
-	<module>org.jcryptool.jre.win64.feature</module>
-	<module>org.jcryptool.jre.linux64.feature</module>
+	<!-- <module>org.jcryptool.jre.macosx.feature</module> -->
+	<!-- <module>org.jcryptool.jre.win64.feature</module> -->
+	<!-- <module>org.jcryptool.jre.linux64.feature</module> -->
     <module>org.jcryptool.product</module>
     <module>org.jcryptool.providers.feature</module>
     <module>org.jcryptool.target</module>
     <module>org.jcryptool.views.feature</module>
     <module>org.jcryptool.webbrowser</module>
   </modules>
-</project>
\ No newline at end of file
+</project>