diff --git a/activemq-web-console/pom.xml b/activemq-web-console/pom.xml
index ca0e150a25..e469ec5589 100755
--- a/activemq-web-console/pom.xml
+++ b/activemq-web-console/pom.xml
@@ -56,7 +56,7 @@
         <version>${jetty-version}</version>
         <configuration>
           <connectors>
-            <connector implementation="org.eclipse.jetty.nio.SelectChannelConnector">
+            <connector implementation="org.eclipse.jetty.server.nio.SelectChannelConnector">
               <port>${jetty.port}</port>
               <maxIdleTime>60000</maxIdleTime>
             </connector>
diff --git a/activemq-web-console/src/test/java/org/apache/activemq/web/tool/Main.java b/activemq-web-console/src/test/java/org/apache/activemq/web/tool/Main.java
index d026dd9f12..122ea8576d 100644
--- a/activemq-web-console/src/test/java/org/apache/activemq/web/tool/Main.java
+++ b/activemq-web-console/src/test/java/org/apache/activemq/web/tool/Main.java
@@ -18,7 +18,6 @@
 package org.apache.activemq.web.tool;
 
 import org.eclipse.jetty.server.Connector;
-import org.eclipse.jetty.server.Handler;
 import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.server.nio.SelectChannelConnector;
 import org.eclipse.jetty.webapp.WebAppContext;
@@ -57,9 +56,7 @@ public final class Main {
         context.setResourceBase(WEBAPP_DIR);
         context.setContextPath(WEBAPP_CTX);
         context.setServer(server);
-        /*server.setHandlers(new Handler[] {
-            context
-        });*/
+        server.setHandler(context);
         server.setConnectors(new Connector[] {
             connector
         });
diff --git a/activemq-web/src/main/java/org/apache/activemq/web/MessageServlet.java b/activemq-web/src/main/java/org/apache/activemq/web/MessageServlet.java
index 31cfa1324e..cf7b5f6558 100644
--- a/activemq-web/src/main/java/org/apache/activemq/web/MessageServlet.java
+++ b/activemq-web/src/main/java/org/apache/activemq/web/MessageServlet.java
@@ -205,6 +205,7 @@ public class MessageServlet extends MessageServletSupport {
 
                     // Get the continuation object (may wait and/or retry
                     // request here).
+                    continuation.setTimeout(timeout);
                     continuation.suspend();
                 }
 
diff --git a/activemq-web/src/test/java/org/apache/activemq/web/JettyServer.java b/activemq-web/src/test/java/org/apache/activemq/web/JettyServer.java
index 2f044294f0..2479f08a5e 100644
--- a/activemq-web/src/test/java/org/apache/activemq/web/JettyServer.java
+++ b/activemq-web/src/test/java/org/apache/activemq/web/JettyServer.java
@@ -72,9 +72,7 @@ public final class JettyServer {
         context.setResourceBase(WEBAPP_DIR);
         context.setContextPath(WEBAPP_CTX);
         context.setServer(server);
-        /*server.setHandlers(new Handler[] {
-            context
-        });*/
+        server.setHandler(context);
         server.setConnectors(new Connector[] {
             connector
         });
diff --git a/assembly/src/release/conf/jetty.xml b/assembly/src/release/conf/jetty.xml
index 09f6b335ef..33bf1bdf24 100644
--- a/assembly/src/release/conf/jetty.xml
+++ b/assembly/src/release/conf/jetty.xml
@@ -47,12 +47,11 @@
               <property name="resourceBase" value="${activemq.base}/webapps/admin"/>
               <property name="logUrlOnStart" value="true"/>
             </bean>
-            <!--<bean class="org.eclipse.jetty.webapp.WebAppContext">
+            <bean class="org.eclipse.jetty.webapp.WebAppContext">
               <property name="contextPath" value="/camel"/>
               <property name="resourceBase" value="${activemq.base}/webapps/camel"/>
               <property name="logUrlOnStart" value="true"/>
             </bean>
-            -->
             <bean class="org.eclipse.jetty.webapp.WebAppContext">
               <property name="contextPath" value="/demo"/>
               <property name="resourceBase" value="${activemq.base}/webapps/demo"/>