diff --git a/http/jetty/src/main/java/org/apache/felix/http/jetty/internal/JettyLogger.java b/http/jetty/src/main/java/org/apache/felix/http/jetty/internal/JettyLogger.java
index 2d72f92..02d73f6 100644
--- a/http/jetty/src/main/java/org/apache/felix/http/jetty/internal/JettyLogger.java
+++ b/http/jetty/src/main/java/org/apache/felix/http/jetty/internal/JettyLogger.java
@@ -57,17 +57,25 @@
 
     public void debug(String msg, Throwable cause)
     {
-        SystemLogger.debug(msg);
+        if (this.debugEnabled) {
+            SystemLogger.debug(msg);
+        }
     }
 
     public void debug(String msg, Object arg0, Object arg1)
     {
-        SystemLogger.debug(format(msg, arg0, arg1));
+        if (this.debugEnabled) {
+            SystemLogger.debug(format(msg, arg0, arg1));
+        }
     }
 
     public void info(String msg, Object arg0, Object arg1)
     {
-        SystemLogger.info(format(msg, arg0, arg1));
+        // Classify all info messages as debug messages.
+        // Jetty uses way to much verbose info messages.
+        if (this.debugEnabled) {
+            SystemLogger.info(format(msg, arg0, arg1));
+        }
     }
 
     public void warn(String msg, Throwable cause)
diff --git a/http/jetty/src/main/java/org/apache/felix/http/jetty/internal/JettyService.java b/http/jetty/src/main/java/org/apache/felix/http/jetty/internal/JettyService.java
index 02f6cc1..2e71b07 100644
--- a/http/jetty/src/main/java/org/apache/felix/http/jetty/internal/JettyService.java
+++ b/http/jetty/src/main/java/org/apache/felix/http/jetty/internal/JettyService.java
@@ -131,6 +131,7 @@
         context.addServlet(new ServletHolder(this.dispatcher), "/*");
 
         this.server.start();
+        SystemLogger.info("Started jetty " + Server.getVersion() + " at port " + this.config.getHttpPort());
     }
 
     private void initializeHttp()
