diff --git a/java/com.sap.sailing.autoload/META-INF/MANIFEST.MF b/java/com.sap.sailing.autoload/META-INF/MANIFEST.MF
index 7bd7df4a694..000db87d0de 100644
--- a/java/com.sap.sailing.autoload/META-INF/MANIFEST.MF
+++ b/java/com.sap.sailing.autoload/META-INF/MANIFEST.MF
@@ -9,12 +9,12 @@ Bundle-ActivationPolicy: lazy
 Export-Package: com.sap.sailing.autoload
 Import-Package: org.json.simple,
  org.json.simple.parser,
- org.osgi.framework;version="1.7.0"
+ org.osgi.framework;version="1.7.0",
+ org.osgi.util.tracker;version="1.5.1"
 Require-Bundle: com.sap.sailing.gwt.ui;bundle-version="1.0.0",
  com.sap.sse.common;bundle-version="1.0.0",
  com.sap.sailing.domain.shared.android;bundle-version="1.0.0",
  com.sap.sailing.domain.tractracadapter,
- org.eclipse.osgi,
  com.sap.sailing.server,
  com.sap.sailing.domain;bundle-version="1.0.0",
  com.sap.sailing.domain.common,
diff --git a/java/com.sap.sailing.media.persistence.test/META-INF/MANIFEST.MF b/java/com.sap.sailing.media.persistence.test/META-INF/MANIFEST.MF
index 3d9e2a96bfe..c6ffbd7c0cf 100644
--- a/java/com.sap.sailing.media.persistence.test/META-INF/MANIFEST.MF
+++ b/java/com.sap.sailing.media.persistence.test/META-INF/MANIFEST.MF
@@ -7,7 +7,6 @@ Bundle-Vendor: SAP
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: com.mongodb.driver;bundle-version="2.6.2",
  com.sap.sailing.mongodb,
- org.eclipse.osgi,
  org.json.simple;bundle-version="1.1.0",
  org.hamcrest.core;bundle-version="1.1.0",
  org.junit4;bundle-version="4.8.2",
@@ -15,4 +14,3 @@ Require-Bundle: com.mongodb.driver;bundle-version="2.6.2",
  com.sap.sailing.gwt.ui;bundle-version="1.0.0",
  com.sap.sailing.domain.common;bundle-version="1.0.0",
  org.hamcrest;bundle-version="1.1.0"
-
diff --git a/java/com.sap.sse.security/META-INF/MANIFEST.MF b/java/com.sap.sse.security/META-INF/MANIFEST.MF
index ce9ec729e56..8aaad1527ed 100644
--- a/java/com.sap.sse.security/META-INF/MANIFEST.MF
+++ b/java/com.sap.sse.security/META-INF/MANIFEST.MF
@@ -11,7 +11,8 @@ Import-Package: javax.mail;version="1.4.0",
  javax.ws.rs;version="1.1.1",
  javax.ws.rs.core;version="1.1.1",
  javax.ws.rs.ext;version="1.1.1",
- org.osgi.framework;version="1.3.0"
+ org.osgi.framework;version="1.3.0",
+ org.osgi.util.tracker;version="1.5.1"
 Bundle-ActivationPolicy: lazy
 Bundle-ClassPath: lib/shiro-core-1.2.2.jar,
  lib/shiro-web-1.2.2.jar,
@@ -24,7 +25,6 @@ Require-Bundle: javax.servlet;bundle-version="2.5.0",
  slf4j.api;bundle-version="1.6.4",
  org.json.simple,
  com.sun.jersey,
- org.eclipse.osgi,
  org.apache.commons.logging;bundle-version="1.1.1",
  org.apache.commons.beanutils;bundle-version="1.8.0"
 Web-ContextPath: /security