diff --git a/java/com.sap.sailing.targetplatform.base/features/target-base/feature.xml b/java/com.sap.sailing.targetplatform.base/features/target-base/feature.xml
index 69be35e2499..b1cd87a8047 100755
--- a/java/com.sap.sailing.targetplatform.base/features/target-base/feature.xml
+++ b/java/com.sap.sailing.targetplatform.base/features/target-base/feature.xml
@@ -459,4 +459,11 @@
          install-size="0"
          version="1.14.12"
          unpack="false"/>
+
+   <plugin
+         id="org.jboss.marshalling.jboss-marshalling-osgi"
+         download-size="0"
+         install-size="0"
+         version="2.1.4.SP1"
+         unpack="false"/>
 </feature>
diff --git a/java/com.sap.sailing.targetplatform.base/plugins/target-base/jboss-marshalling-osgi-2.1.4.SP1.jar b/java/com.sap.sailing.targetplatform.base/plugins/target-base/jboss-marshalling-osgi-2.1.4.SP1.jar
new file mode 100644
index 00000000000..c37daea76bc
Binary files /dev/null and b/java/com.sap.sailing.targetplatform.base/plugins/target-base/jboss-marshalling-osgi-2.1.4.SP1.jar differ
diff --git a/java/com.sap.sailing.targetplatform/definitions/race-analysis-p2-remote.target b/java/com.sap.sailing.targetplatform/definitions/race-analysis-p2-remote.target
index c2acb1edd0c..dcab5b46e04 100755
--- a/java/com.sap.sailing.targetplatform/definitions/race-analysis-p2-remote.target
+++ b/java/com.sap.sailing.targetplatform/definitions/race-analysis-p2-remote.target
@@ -412,6 +412,7 @@
 <plugin id="io.reactivex.rxjava3.rxjava"/>
 <plugin id="reactive-streams"/>
 <plugin id="jodd-bean"/>
+<plugin id="org.jboss.marshalling.jboss-marshalling-osgi"/>
 <plugin id="com.google.gson"/>
 <plugin id="com.google.gson.source"/>
 <plugin id="com.amazonaws.aws-lambda-java-core"/>
diff --git a/java/com.sap.sse.feature.runtime/feature.xml b/java/com.sap.sse.feature.runtime/feature.xml
index 0c3045f367a..5d9072a2374 100644
--- a/java/com.sap.sse.feature.runtime/feature.xml
+++ b/java/com.sap.sse.feature.runtime/feature.xml
@@ -1284,4 +1284,11 @@
          install-size="0"
          version="1.14.12"
          unpack="false"/>
+
+   <plugin
+         id="org.jboss.marshalling.jboss-marshalling-osgi"
+         download-size="0"
+         install-size="0"
+         version="2.1.4.SP1"
+         unpack="false"/>
 </feature>