diff --git a/stocks/README.md b/stocks/README.md
index 0c33024..8a1b06d 100644
--- a/stocks/README.md
+++ b/stocks/README.md
@@ -1,3 +1,16 @@
-This branch contains a version of the Spring AMQP stocks sample modified to take advantage of Spring MVC 3.2, Servlet-based async support. The change shows how an existing application with client-side polling can improve its latency while also optimizing the number of requests required to deliver updates. 
 
-The details of the changes can be viewed in the following [commit](https://github.com/SpringSource/spring-amqp-samples/commit/1a241f8cd68835fa9e6af4e987bccf7b9e6b8bf1).
+### Note
+
+There is a bug that affects Tomcat 7.0.29 (see [Bug 53623](https://issues.apache.org/bugzilla/show_bug.cgi?id=53623). To use Tomcat to run this sample, you will need Tomcat 7.0.30 or a nightly 7.0.x snapshot (not yet available at the time of writing).
+
+### Overview
+This branch contains a version of the Spring AMQP stocks sample modified to take advantage of Spring MVC 3.2, Servlet-based async support. The change shows how an existing application with client-side polling can improve its latency while also optimizing the number of requests required to deliver updates. The changes can be viewed in following [commit 1a241f](https://github.com/SpringSource/spring-amqp-samples/commit/1a241f8cd68835fa9e6af4e987bccf7b9e6b8bf1) and although additional changes have been made afterwards, the referenced commit provides a good summary.
+
+
+
+
+
+
+
+
+
diff --git a/stocks/src/main/resources/servlet-config.xml b/stocks/src/main/resources/servlet-config.xml
index 7562333..fad7eb1 100644
--- a/stocks/src/main/resources/servlet-config.xml
+++ b/stocks/src/main/resources/servlet-config.xml
@@ -2,7 +2,7 @@
 <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:context="http://www.springframework.org/schema/context" xmlns:mvc="http://www.springframework.org/schema/mvc"
 	xmlns:rabbit="http://www.springframework.org/schema/rabbit"
-	xsi:schemaLocation="http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-3.0.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-3.2.xsd
 		http://www.springframework.org/schema/rabbit http://www.springframework.org/schema/rabbit/spring-rabbit-1.0.xsd
 		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
 		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.1.xsd">
@@ -51,14 +51,8 @@
 
 	<mvc:default-servlet-handler />
 
-	<mvc:annotation-driven />
+	<mvc:annotation-driven>
+		<mvc:async-support default-timeout="30000" />
+	</mvc:annotation-driven>
 
-	<bean class="org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter">
-		<property name="order" value="0"/>
-		<property name="asyncRequestTimeout" value="30000"/>
-		<property name="messageConverters">
-			<bean class="org.springframework.http.converter.json.MappingJacksonHttpMessageConverter"/>
-		</property>
-	</bean>
-
-</beans>
+</beans>
\ No newline at end of file