diff --git a/spring-webflow-samples/booking-portlet-faces/.classpath b/spring-webflow-samples/booking-portlet-faces/.classpath
index afae6359..87b33ef0 100644
--- a/spring-webflow-samples/booking-portlet-faces/.classpath
+++ b/spring-webflow-samples/booking-portlet-faces/.classpath
@@ -7,5 +7,6 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.junit/com.springsource.junit/3.8.2/com.springsource.junit-3.8.2.jar" sourcepath="/IVY_CACHE/org.junit/com.springsource.junit/3.8.2/com.springsource.junit-sources-3.8.2.jar"/>
+	<classpathentry kind="lib" path="lib/jsf-portlet.jar" sourcepath="lib/jsf-portlet-1.2.5-src.zip"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/spring-webflow-samples/booking-portlet-faces/.settings/org.eclipse.wst.common.component b/spring-webflow-samples/booking-portlet-faces/.settings/org.eclipse.wst.common.component
index 6c973eb9..4e8683b7 100644
--- a/spring-webflow-samples/booking-portlet-faces/.settings/org.eclipse.wst.common.component
+++ b/spring-webflow-samples/booking-portlet-faces/.settings/org.eclipse.wst.common.component
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project-modules id="moduleCoreId" project-version="1.5.0">
 <wb-module deploy-name="swf-booking-portlet-faces">
-<wb-resource deploy-path="/" source-path="/target/war-expanded"/>
-<wb-resource deploy-path="/WEB-INF/lib" source-path="/pluto-runtime-libs"/>
+<wb-resource deploy-path="/" source-path="/src/main/webapp"/>
+<wb-resource deploy-path="/WEB-INF/lib" source-path="/target/war-expanded/WEB-INF/lib"/>
+<wb-resource deploy-path="/WEB-INF/lib" source-path="/lib"/>
+<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
+<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
 <property name="java-output-path" value="target/classes"/>
 <property name="context-root" value="/swf-booking-portlet-faces"/>
 </wb-module>
diff --git a/spring-webflow-samples/booking-portlet-faces/lib/jsf-portlet-1.2.5-src.zip b/spring-webflow-samples/booking-portlet-faces/lib/jsf-portlet-1.2.5-src.zip
new file mode 100644
index 00000000..db95cf6e
Binary files /dev/null and b/spring-webflow-samples/booking-portlet-faces/lib/jsf-portlet-1.2.5-src.zip differ
diff --git a/spring-webflow-samples/booking-portlet-faces/pluto-runtime-libs/jsf-portlet.jar b/spring-webflow-samples/booking-portlet-faces/lib/jsf-portlet.jar
similarity index 59%
rename from spring-webflow-samples/booking-portlet-faces/pluto-runtime-libs/jsf-portlet.jar
rename to spring-webflow-samples/booking-portlet-faces/lib/jsf-portlet.jar
index 3c4c3e61..e1f1b830 100644
Binary files a/spring-webflow-samples/booking-portlet-faces/pluto-runtime-libs/jsf-portlet.jar and b/spring-webflow-samples/booking-portlet-faces/lib/jsf-portlet.jar 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
new file mode 100644
index 00000000..8a0d7056
--- /dev/null
+++ b/spring-webflow-samples/booking-portlet-faces/src/main/webapp/WEB-INF/faces-config.xml
@@ -0,0 +1,11 @@
+<?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-mvc/.settings/org.eclipse.wst.common.component b/spring-webflow-samples/booking-portlet-mvc/.settings/org.eclipse.wst.common.component
index 553e8240..9ed3bfbd 100644
--- a/spring-webflow-samples/booking-portlet-mvc/.settings/org.eclipse.wst.common.component
+++ b/spring-webflow-samples/booking-portlet-mvc/.settings/org.eclipse.wst.common.component
@@ -3,11 +3,8 @@
 <wb-module deploy-name="swf-booking-portlet-mvc">
 <wb-resource deploy-path="/" source-path="/src/main/webapp"/>
 <wb-resource deploy-path="/WEB-INF/lib" source-path="/target/war-expanded/WEB-INF/lib"/>
-<wb-resource deploy-path="/WEB-INF/lib" source-path="/lib/global"/>
 <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
 <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
-<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/test/java"/>
-<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/test/resources"/>
 <property name="java-output-path" value="target/classes"/>
 <property name="context-root" value="/swf-booking-mvc"/>
 </wb-module>