diff --git a/spring-webflow-samples/booking-portlet-faces/pluto-runtime-libs/com.springsource.com.sun.el-1.0.0.jar b/spring-webflow-samples/booking-portlet-faces/pluto-runtime-libs/com.springsource.com.sun.el-1.0.0.jar
deleted file mode 100644
index cc57de69..00000000
Binary files a/spring-webflow-samples/booking-portlet-faces/pluto-runtime-libs/com.springsource.com.sun.el-1.0.0.jar and /dev/null differ
diff --git a/spring-webflow-samples/booking-portlet-faces/pluto-runtime-libs/com.springsource.javax.el-1.0.0.jar b/spring-webflow-samples/booking-portlet-faces/pluto-runtime-libs/com.springsource.javax.el-1.0.0.jar
deleted file mode 100644
index d562de53..00000000
Binary files a/spring-webflow-samples/booking-portlet-faces/pluto-runtime-libs/com.springsource.javax.el-1.0.0.jar and /dev/null differ
diff --git a/spring-webflow-samples/booking-portlet-faces/src/main/webapp/WEB-INF/faces-config.xml b/spring-webflow-samples/booking-portlet-faces/src/main/webapp/WEB-INF/faces-config.xml
deleted file mode 100644
index 8a0d7056..00000000
--- a/spring-webflow-samples/booking-portlet-faces/src/main/webapp/WEB-INF/faces-config.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE faces-config PUBLIC
-  "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.0//EN"
-  "http://java.sun.com/dtd/web-facesconfig_1_0.dtd">
-
-<faces-config>
-	<application>
-		<!-- Enables Facelets -->
-		<view-handler>com.sun.facelets.FaceletViewHandler</view-handler>  
-	</application>
-</faces-config>
\ No newline at end of file
diff --git a/spring-webflow-samples/booking-portlet-faces/src/main/webapp/WEB-INF/web.xml b/spring-webflow-samples/booking-portlet-faces/src/main/webapp/WEB-INF/web.xml
index 7191aa2b..190391ba 100644
--- a/spring-webflow-samples/booking-portlet-faces/src/main/webapp/WEB-INF/web.xml
+++ b/spring-webflow-samples/booking-portlet-faces/src/main/webapp/WEB-INF/web.xml
@@ -50,7 +50,7 @@
 	<!-- Generated Portlet Wrapper Servlet for Apache Pluto deployment -->
 	<servlet>
 		<servlet-name>swf-booking-faces</servlet-name>
-		<servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
+		<servlet-class>org.apache.pluto.container.driver.PortletServlet</servlet-class>
 		<init-param>
 			<param-name>portlet-name</param-name>
 			<param-value>swf-booking-faces</param-value>
diff --git a/spring-webflow-samples/booking-portlet-mvc/ivy.xml b/spring-webflow-samples/booking-portlet-mvc/ivy.xml
index 9222393f..68c46e87 100644
--- a/spring-webflow-samples/booking-portlet-mvc/ivy.xml
+++ b/spring-webflow-samples/booking-portlet-mvc/ivy.xml
@@ -21,7 +21,7 @@
 
 	<dependencies>
 		<!-- core dependencies -->
-		<dependency	org="javax.el" name="com.springsource.javax.el" rev="1.0.0" conf="compile->compile"/>
+		<dependency	org="javax.el" name="com.springsource.javax.el" rev="1.0.0" conf="provided->compile"/>
 		<dependency org="javax.persistence" name="com.springsource.javax.persistence" rev="1.0.0" conf="compile->compile"/>
 		<dependency	org="javax.portlet" name="com.springsource.javax.portlet" rev="2.0.0" conf="provided->compile"/>
 		<dependency	org="javax.servlet" name="com.springsource.javax.servlet" rev="2.4.0" conf="provided->compile"/>
diff --git a/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/flows/booking/enterBookingDetails.jsp b/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/flows/booking/enterBookingDetails.jsp
index d4a91c60..d16da7fa 100644
--- a/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/flows/booking/enterBookingDetails.jsp
+++ b/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/flows/booking/enterBookingDetails.jsp
@@ -1,5 +1,5 @@
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-<%@ taglib prefix="portlet" uri="http://java.sun.com/portlet" %>
+<%@ taglib prefix="portlet" uri="http://java.sun.com/portlet_2_0"%>
 <%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
 <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
 
diff --git a/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/flows/booking/reviewBooking.jsp b/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/flows/booking/reviewBooking.jsp
index 4dcea977..d95fbaa2 100644
--- a/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/flows/booking/reviewBooking.jsp
+++ b/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/flows/booking/reviewBooking.jsp
@@ -1,5 +1,5 @@
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-<%@ taglib prefix="portlet" uri="http://java.sun.com/portlet" %>
+<%@ taglib prefix="portlet" uri="http://java.sun.com/portlet_2_0"%>
 <%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
 <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
 
diff --git a/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/flows/main/enterSearchCriteria.jsp b/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/flows/main/enterSearchCriteria.jsp
index d8be01ee..10620e27 100644
--- a/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/flows/main/enterSearchCriteria.jsp
+++ b/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/flows/main/enterSearchCriteria.jsp
@@ -1,5 +1,5 @@
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-<%@ taglib prefix="portlet" uri="http://java.sun.com/portlet" %>
+<%@ taglib prefix="portlet" uri="http://java.sun.com/portlet_2_0"%>
 <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
 
 <portlet:actionURL var="actionUrl">
diff --git a/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/flows/main/reviewHotel.jsp b/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/flows/main/reviewHotel.jsp
index 6a237fbb..a617049f 100644
--- a/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/flows/main/reviewHotel.jsp
+++ b/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/flows/main/reviewHotel.jsp
@@ -1,5 +1,5 @@
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-<%@ taglib prefix="portlet" uri="http://java.sun.com/portlet" %>
+<%@ taglib prefix="portlet" uri="http://java.sun.com/portlet_2_0"%>
 <%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
 <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
 
diff --git a/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/flows/main/reviewHotels.jsp b/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/flows/main/reviewHotels.jsp
index ad86c5ed..ee66c034 100644
--- a/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/flows/main/reviewHotels.jsp
+++ b/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/flows/main/reviewHotels.jsp
@@ -1,5 +1,5 @@
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-<%@ taglib prefix="portlet" uri="http://java.sun.com/portlet" %>
+<%@ taglib prefix="portlet" uri="http://java.sun.com/portlet_2_0"%>
 <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
 
 <h2>Hotel Results</h2>
diff --git a/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/flows/view/intro.jsp b/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/flows/view/intro.jsp
index 7e345b28..1fe0053f 100644
--- a/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/flows/view/intro.jsp
+++ b/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/flows/view/intro.jsp
@@ -1,5 +1,5 @@
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-<%@ taglib prefix="portlet" uri="http://java.sun.com/portlet" %>
+<%@ taglib prefix="portlet" uri="http://java.sun.com/portlet_2_0"%>
 
 <h2>Welcome to Spring Travel</h2>
 <p>
diff --git a/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/portlet.xml b/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/portlet.xml
index 56e9734f..c3fcc9fd 100644
--- a/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/portlet.xml
+++ b/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/portlet.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <portlet-app
-	xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"
-	version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd">
+	xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd"
+	version="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd">
 
 	<portlet>
 		<portlet-name>swf-booking-mvc</portlet-name>
diff --git a/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/web.xml b/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/web.xml
index 96b3c98b..cfc6aa1d 100644
--- a/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/web.xml
+++ b/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/web.xml
@@ -51,7 +51,7 @@
 	<!-- Generated Portlet Wrapper Servlet for Apache Pluto deployment -->
 	<servlet>
 		<servlet-name>swf-booking-mvc</servlet-name>
-		<servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
+		<servlet-class>org.apache.pluto.container.driver.PortletServlet</servlet-class>
 		<init-param>
 			<param-name>portlet-name</param-name>
 			<param-value>swf-booking-mvc</param-value>
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/mvc/portlet/FlowHandlerAdapter.java b/spring-webflow/src/main/java/org/springframework/webflow/mvc/portlet/FlowHandlerAdapter.java
index ce0a9cee..e6d58e7d 100644
--- a/spring-webflow/src/main/java/org/springframework/webflow/mvc/portlet/FlowHandlerAdapter.java
+++ b/spring-webflow/src/main/java/org/springframework/webflow/mvc/portlet/FlowHandlerAdapter.java
@@ -25,6 +25,7 @@ import javax.portlet.EventRequest;
 import javax.portlet.EventResponse;
 import javax.portlet.PortletModeException;
 import javax.portlet.PortletRequest;
+import javax.portlet.PortletRequestDispatcher;
 import javax.portlet.PortletResponse;
 import javax.portlet.PortletSession;
 import javax.portlet.RenderRequest;
@@ -156,12 +157,20 @@ public class FlowHandlerAdapter extends PortletContentGenerator implements Handl
 	}
 
 	public void handleEvent(EventRequest request, EventResponse response, Object handler) throws Exception {
-		throw new UnsupportedOperationException("Auto-generated method stub");
+		// keep render params
+		response.setRenderParameters(request);
 	}
 
 	public ModelAndView handleResource(ResourceRequest request, ResourceResponse response, Object handler)
 			throws Exception {
-		throw new UnsupportedOperationException("Auto-generated method stub");
+		// equivalent to Portlet 2.0 GenericPortlet
+		if (request.getResourceID() != null) {
+			PortletRequestDispatcher rd = this.getPortletContext().getRequestDispatcher(request.getResourceID());
+			if (rd != null) {
+				rd.forward(request, response);
+			}
+		}
+		return null;
 	}
 
 	// subclassing hooks