diff --git a/java/com.sap.sailing.domain.igtimiadapter/META-INF/MANIFEST.MF b/java/com.sap.sailing.domain.igtimiadapter/META-INF/MANIFEST.MF
index f202d557b69..c6468dce9ce 100644
--- a/java/com.sap.sailing.domain.igtimiadapter/META-INF/MANIFEST.MF
+++ b/java/com.sap.sailing.domain.igtimiadapter/META-INF/MANIFEST.MF
@@ -21,15 +21,16 @@ Import-Package: javax.ws.rs;version="1.1.1",
  javax.ws.rs.core;version="1.1.1",
  javax.ws.rs.ext;version="1.1.1",
  org.apache.commons.lang,
+ org.codehaus.jackson.jaxrs;version="1.9.13",
  org.eclipse.jetty.io;version="9.0.0",
  org.eclipse.jetty.util.component;version="9.0.4",
+ org.eclipse.jetty.util.ssl,
  org.eclipse.jetty.websocket.api;version="9.0.0",
  org.eclipse.jetty.websocket.api.annotations;version="9.0.0",
  org.eclipse.jetty.websocket.api.extensions;version="9.0.0",
  org.eclipse.jetty.websocket.client;version="9.0.0",
  org.eclipse.jetty.websocket.common;version="9.0.0",
- org.osgi.framework;version="1.7.0",
- org.codehaus.jackson.jaxrs;version="1.9.13"
+ org.osgi.framework;version="1.7.0"
 Web-ContextPath: /igtimi
 Bundle-Activator: com.sap.sailing.domain.igtimiadapter.impl.Activator
 Export-Package: com.sap.sailing.domain.igtimiadapter,
diff --git a/java/com.sap.sailing.domain.igtimiadapter/src/com/sap/sailing/domain/igtimiadapter/websocket/WebSocketConnectionManager.java b/java/com.sap.sailing.domain.igtimiadapter/src/com/sap/sailing/domain/igtimiadapter/websocket/WebSocketConnectionManager.java
index c259794d9c8..90a54c7980b 100755
--- a/java/com.sap.sailing.domain.igtimiadapter/src/com/sap/sailing/domain/igtimiadapter/websocket/WebSocketConnectionManager.java
+++ b/java/com.sap.sailing.domain.igtimiadapter/src/com/sap/sailing/domain/igtimiadapter/websocket/WebSocketConnectionManager.java
@@ -10,6 +10,7 @@ import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
+import org.eclipse.jetty.util.ssl.SslContextFactory;
 import org.eclipse.jetty.websocket.api.Session;
 import org.eclipse.jetty.websocket.api.WebSocketAdapter;
 import org.eclipse.jetty.websocket.client.ClientUpgradeRequest;
@@ -60,7 +61,7 @@ public class WebSocketConnectionManager extends WebSocketAdapter implements Live
         this.fixFactory = new FixFactory();
         this.connectionFactory = connectionFactory;
         this.listeners = new ConcurrentHashMap<>();
-        client = new WebSocketClient();
+        client = new WebSocketClient(new SslContextFactory());
         configurationMessage = connectionFactory.getWebSocketConfigurationMessage(account, deviceSerialNumbers);
         request = new ClientUpgradeRequest();
         reconnect();
@@ -227,9 +228,7 @@ public class WebSocketConnectionManager extends WebSocketAdapter implements Live
         IOException lastException = null;
         for (URI uri : connectionFactory.getWebsocketServers()) {
             try {
-                if (uri.getScheme().equals("ws")) {
-                    // as Jetty 9.0.4 currently doesn't seem to support wss, explicitly
-                    // look for ws connectivity
+                if (uri.getScheme().equals("ws") || uri.getScheme().equals("wss")) {
                     logger.log(Level.INFO, "Trying to connect to " + uri + " for " + this);
                     client.start();
                     client.connect(this, uri, request);