diff --git a/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/config/webmvc-config.xml b/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/config/webmvc-config.xml
index 8773dabe..ed285bce 100644
--- a/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/config/webmvc-config.xml
+++ b/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/config/webmvc-config.xml
@@ -4,31 +4,28 @@
        xsi:schemaLocation="
            http://www.springframework.org/schema/beans
            http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
-
-	<!-- Maps request URIs to controllers -->			
-	<bean class="org.springframework.web.servlet.handler.SimpleUrlHandlerMapping">
-		<property name="mappings">
-			<value>
-				/main=flowController
-				/booking=flowController
-			</value>
-		</property>
-		<property name="defaultHandler">
-			<!-- Selects view names to render based on the request URI: e.g. /main selects "main" -->	
-			<bean class="org.springframework.web.servlet.mvc.UrlFilenameViewController" />
-		</property>
-	</bean>
-
-	<!-- Handles requests mapped to the Spring Web Flow system -->
-	<bean id="flowController" class="org.springframework.webflow.mvc.servlet.FlowController">
-		<property name="flowExecutor" ref="flowExecutor"/>
-	</bean>
-
+
+	<!-- Maps request paths to flows in the flowRegistry; e.g. a path of /hotels/booking looks for a flow with id "hotels/booking" -->
+	<bean class="org.springframework.webflow.mvc.servlet.FlowHandlerMapping">
+		<property name="defaultHandler">
+			<!-- If no flow match, map path to a view to render; e.g. the "/intro" path would map to the view named "intro" -->	
+			<bean class="org.springframework.web.servlet.mvc.UrlFilenameViewController" />
+		</property>
+	</bean>
+
 	<!-- Maps logical view names to Facelet templates (e.g. 'search' to '/WEB-INF/search.xhtml' -->
 	<bean id="faceletsViewResolver" class="org.springframework.web.servlet.view.UrlBasedViewResolver">
 		<property name="viewClass" value="org.springframework.faces.mvc.JsfView"/>
 		<property name="prefix" value="/WEB-INF/" />
 		<property name="suffix" value=".xhtml" />
-	</bean>
-		
+	</bean>
+
+	<!-- Handles requests mapped to the Spring Web Flow system -->
+	<bean class="org.springframework.webflow.mvc.servlet.FlowHandlerAdapter">
+		<property name="flowExecutor" ref="flowExecutor" />
+	</bean>
+	
+	<!-- Dispatches requests mapped to org.springframework.web.servlet.mvc.Controller implementations -->
+	<bean class="org.springframework.web.servlet.mvc.SimpleControllerHandlerAdapter" />
+			
 </beans>
\ No newline at end of file