diff --git a/activemq-web-demo/pom.xml b/activemq-web-demo/pom.xml
index a1fe9b26d5..5ec2742fd1 100755
--- a/activemq-web-demo/pom.xml
+++ b/activemq-web-demo/pom.xml
@@ -38,7 +38,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/src/main/java/org/apache/activemq/web/MessageListenerServlet.java b/activemq-web/src/main/java/org/apache/activemq/web/MessageListenerServlet.java
index 580b1b9cd7..3ccda21884 100644
--- a/activemq-web/src/main/java/org/apache/activemq/web/MessageListenerServlet.java
+++ b/activemq-web/src/main/java/org/apache/activemq/web/MessageListenerServlet.java
@@ -264,6 +264,7 @@ public class MessageListenerServlet extends MessageServletSupport {
         }
 
         Continuation continuation = ContinuationSupport.getContinuation(request);
+        continuation.setTimeout(timeout);
         Listener listener = getListener(request);
         if (listener != null && continuation != null && !continuation.isSuspended()) {
             listener.access();
diff --git a/assembly/src/release/conf/jetty.xml b/assembly/src/release/conf/jetty.xml
index d8763329ca..4f00bcc36c 100644
--- a/assembly/src/release/conf/jetty.xml
+++ b/assembly/src/release/conf/jetty.xml
@@ -25,7 +25,7 @@
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
  
-  <!--  <bean id="contexts" class="org.eclipse.jetty.server.handler.ContextHandlerCollection"/> -->
+  <bean id="contexts" class="org.eclipse.jetty.server.handler.ContextHandlerCollection"/>
  
   <bean id="Server" class="org.eclipse.jetty.server.Server" init-method="start" destroy-method="stop">
  
@@ -41,8 +41,7 @@
       <bean id="handlers" class="org.eclipse.jetty.server.handler.HandlerCollection">
         <property name="handlers">
           <list>
-            <!--  <ref bean="contexts"/>
-            <bean id="defaultHandler" class="org.eclipse.jetty.server.handler.DefaultHandler"/> -->
+            <ref bean="contexts"/>
             <bean class="org.eclipse.jetty.webapp.WebAppContext">
               <property name="contextPath" value="/admin"/>
               <property name="resourceBase" value="${activemq.base}/webapps/admin"/>
@@ -53,16 +52,20 @@
               <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"/>
               <property name="logUrlOnStart" value="true"/>
             </bean>
+            <!--
             <bean class="org.eclipse.jetty.webapp.WebAppContext">
               <property name="contextPath" value="/fileserver"/>
               <property name="resourceBase" value="${activemq.base}/webapps/fileserver"/>
               <property name="logUrlOnStart" value="true"/>
-            </bean>-->
+            </bean>
+            -->
+            <bean id="defaultHandler" class="org.eclipse.jetty.server.handler.DefaultHandler"/>
           </list>
         </property>
       </bean>
@@ -70,4 +73,4 @@
  
   </bean>
  
-</beans>
\ No newline at end of file
+</beans>