diff --git a/java/com.sap.sailing.dashboards.gwt/META-INF/MANIFEST.MF b/java/com.sap.sailing.dashboards.gwt/META-INF/MANIFEST.MF
index 5cd7adf9e26..bd39ad903a0 100644
--- a/java/com.sap.sailing.dashboards.gwt/META-INF/MANIFEST.MF
+++ b/java/com.sap.sailing.dashboards.gwt/META-INF/MANIFEST.MF
@@ -8,7 +8,7 @@ Bundle-Vendor: SAP
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Require-Bundle: com.sap.sailing.domain,
  com.sap.sailing.server,
- com.google.gwt.osgi;bundle-version="2.6.1",
+ com.google.gwt.servlet;bundle-version="2.8.0",
  com.sap.sse.common,
  com.sap.sailing.domain.common,
  com.sap.sailing.domain.shared.android,
diff --git a/java/com.sap.sailing.feature/feature.xml b/java/com.sap.sailing.feature/feature.xml
index 12e6cbee047..d90ecfcc176 100755
--- a/java/com.sap.sailing.feature/feature.xml
+++ b/java/com.sap.sailing.feature/feature.xml
@@ -25,7 +25,7 @@ Computes leaderboard information for sailing races and offers RESTful APIs to al
       <import plugin="org.eclipse.osgi" version="3.10.1" match="greaterOrEqual"/>
       <import plugin="javax.servlet" version="3.1.0" match="greaterOrEqual"/>
       <import plugin="org.mongodb.mongo-java-driver" version="2.13.0" match="greaterOrEqual"/>
-      <import plugin="com.google.gwt.osgi" version="2.7.0" match="greaterOrEqual"/>
+      <import plugin="com.google.gwt.servlet" version="2.8.0" match="greaterOrEqual"/>
       <import plugin="org.json.simple" version="1.1.0" match="greaterOrEqual"/>
       <import plugin="org.moxieapps.gwt.highcharts" version="1.6.0" match="greaterOrEqual"/>
       <import plugin="com.rabbitmq.client"/>
diff --git a/java/com.sap.sailing.gwt.ui/META-INF/MANIFEST.MF b/java/com.sap.sailing.gwt.ui/META-INF/MANIFEST.MF
index 8cfb13530f1..fd649aedb47 100644
--- a/java/com.sap.sailing.gwt.ui/META-INF/MANIFEST.MF
+++ b/java/com.sap.sailing.gwt.ui/META-INF/MANIFEST.MF
@@ -24,7 +24,7 @@ Require-Bundle: com.sap.sailing.domain,
  com.sap.sailing.freg.resultimport,
  com.sap.sailing.domain.swisstimingreplayadapter,
  com.sap.sailing.simulator,
- com.google.gwt.osgi;bundle-version="2.6.0",
+ com.google.gwt.servlet;bundle-version="2.8.0",
  com.sap.sailing.domain.igtimiadapter,
  com.sap.sailing.xrr.resultimport,
  com.sap.sailing.datamining.shared,
diff --git a/java/com.sap.sailing.xrr.structureimport/META-INF/MANIFEST.MF b/java/com.sap.sailing.xrr.structureimport/META-INF/MANIFEST.MF
index 0408f301f2c..ef943cd6f43 100644
--- a/java/com.sap.sailing.xrr.structureimport/META-INF/MANIFEST.MF
+++ b/java/com.sap.sailing.xrr.structureimport/META-INF/MANIFEST.MF
@@ -9,7 +9,7 @@ Export-Package: .,
  com.sap.sailing.xrr.structureimport.buildstructure;uses:="com.sap.sailing.xrr.resultimport.schema",
  com.sapsailing.xrr.structureimport.eventimport
 Bundle-ActivationPolicy: lazy
-Require-Bundle: com.google.gwt.osgi;bundle-version="2.6.0",
+Require-Bundle: com.google.gwt.servlet;bundle-version="2.8.0",
  com.sap.sailing.domain.common;bundle-version="1.0.0",
  com.sap.sailing.domain,
  com.sap.sailing.xrr.schema;bundle-version="1.0.0",
diff --git a/java/com.sap.sse.gwt.adminconsole/META-INF/MANIFEST.MF b/java/com.sap.sse.gwt.adminconsole/META-INF/MANIFEST.MF
index 0fa8c2cf366..8959ce10582 100644
--- a/java/com.sap.sse.gwt.adminconsole/META-INF/MANIFEST.MF
+++ b/java/com.sap.sse.gwt.adminconsole/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Bundle-SymbolicName: com.sap.sse.gwt.adminconsole
 Bundle-Version: 1.0.0.qualifier
 Bundle-Vendor: SAP
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
-Require-Bundle: com.google.gwt.osgi;bundle-version="2.7.0",
+Require-Bundle: com.google.gwt.servlet;bundle-version="2.8.0",
  com.sap.sse.gwt,
  com.sap.sse.security.ui,
  com.sap.sse.security,
diff --git a/java/com.sap.sse.gwt.test/META-INF/MANIFEST.MF b/java/com.sap.sse.gwt.test/META-INF/MANIFEST.MF
index c18fe42b33d..c5dcf963320 100644
--- a/java/com.sap.sse.gwt.test/META-INF/MANIFEST.MF
+++ b/java/com.sap.sse.gwt.test/META-INF/MANIFEST.MF
@@ -8,4 +8,4 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Fragment-Host: com.sap.sse.gwt
 Require-Bundle: com.sap.sse.common;bundle-version="1.0.0",
  org.junit4;bundle-version="4.8.2",
- com.google.gwt.osgi;bundle-version="2.7.0"
+ com.google.gwt.servlet;bundle-version="2.8.0"
diff --git a/java/com.sap.sse.gwt/META-INF/MANIFEST.MF b/java/com.sap.sse.gwt/META-INF/MANIFEST.MF
index b4591f39c5b..68e2f0d6cf9 100644
--- a/java/com.sap.sse.gwt/META-INF/MANIFEST.MF
+++ b/java/com.sap.sse.gwt/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Bundle-SymbolicName: com.sap.sse.gwt
 Bundle-Version: 1.0.0.qualifier
 Bundle-Vendor: SAP
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
-Require-Bundle: com.google.gwt.osgi;bundle-version="2.7.0",
+Require-Bundle: com.google.gwt.servlet;bundle-version="2.8.0",
  com.sap.sse.common,
  com.sap.sse.filestorage
 Bundle-ActivationPolicy: lazy
diff --git a/java/com.sap.sse.security.ui/META-INF/MANIFEST.MF b/java/com.sap.sse.security.ui/META-INF/MANIFEST.MF
index fc7c036ea31..33b5e32ba9e 100644
--- a/java/com.sap.sse.security.ui/META-INF/MANIFEST.MF
+++ b/java/com.sap.sse.security.ui/META-INF/MANIFEST.MF
@@ -12,7 +12,7 @@ Bundle-ActivationPolicy: lazy
 Bundle-ClassPath: WEB-INF/classes/
 Require-Bundle: javax.servlet;bundle-version="2.5.0",
  com.sap.sse.gwt,
- com.google.gwt.osgi;bundle-version="2.7.0",
+ com.google.gwt.servlet;bundle-version="2.8.0",
  com.sap.sse.security,
  org.json.simple,
  com.sap.sailing.domain.common,
diff --git a/java/org.moxieapps.gwt.highcharts/META-INF/MANIFEST.MF b/java/org.moxieapps.gwt.highcharts/META-INF/MANIFEST.MF
index d40e5c2198d..a1f71d1b5b3 100644
--- a/java/org.moxieapps.gwt.highcharts/META-INF/MANIFEST.MF
+++ b/java/org.moxieapps.gwt.highcharts/META-INF/MANIFEST.MF
@@ -19,4 +19,4 @@ Export-Package: org.moxieapps.gwt.highcharts.client.plotOptions;uses:="o
  ieapps.gwt.highcharts.client,com.google.gwt.json.client";version="1.5.0
  "
 Bundle-ActivationPolicy: lazy
-Require-Bundle: com.google.gwt.osgi;bundle-version="2.6.0"
+Require-Bundle: com.google.gwt.servlet;bundle-version="2.8.0"