diff --git a/spring-webflow-samples/booking-faces/pom.xml b/spring-webflow-samples/booking-faces/pom.xml
index 52f899f0..23f0f035 100644
--- a/spring-webflow-samples/booking-faces/pom.xml
+++ b/spring-webflow-samples/booking-faces/pom.xml
@@ -7,11 +7,6 @@
 	<packaging>war</packaging>
 	<version>2.1.0.BUILD-SNAPSHOT</version>
 	<dependencies>
-		<dependency>
-			<groupId>com.sun.facelets</groupId>
-			<artifactId>com.springsource.com.sun.facelets</artifactId>
-			<version>1.1.14</version>
-		</dependency>
 		<dependency>
 			<groupId>javax.persistence</groupId>
 			<artifactId>com.springsource.javax.persistence</artifactId>
@@ -20,7 +15,7 @@
 		<dependency>
 			<groupId>javax.servlet</groupId>
 			<artifactId>com.springsource.javax.servlet.jsp.jstl</artifactId>
-			<version>1.1.2</version>
+			<version>1.2.0</version>
 		</dependency>
 		<dependency>
 			<groupId>javax.transaction</groupId>
@@ -139,13 +134,13 @@
 		</dependency>
 		<dependency>
 			<groupId>javax.faces</groupId>
-			<artifactId>com.springsource.javax.faces</artifactId>
-			<version>${jsf.version}</version>
+			<artifactId>jsf-api</artifactId>
+			<version>2.0</version>
 		</dependency>
 		<dependency>
 			<groupId>com.sun.faces</groupId>
-			<artifactId>com.springsource.com.sun.faces</artifactId>
-			<version>${jsf.version}</version>
+			<artifactId>jsf-impl</artifactId>
+			<version>2.0.2</version>
 		</dependency>
 		<!-- build time only dependencies -->
 		<dependency>
@@ -196,6 +191,11 @@
 			<name>SpringSource Enterprise Bundle Repository - Snapshot Releases</name>
 			<url>http://repository.springsource.com/maven/bundles/snapshot</url>
 		</repository>		
+		<repository>
+			<id>java.net.release</id>
+			<name>Repository for Projects On Hosted on java.net</name>
+			<url>http://download.java.net/maven/2</url>
+		</repository>
 	</repositories>
 	<build>
 		<finalName>swf-booking-faces</finalName>
@@ -212,6 +212,5 @@
 	</build>
 	<properties>
 		<spring.version>3.0.2.RELEASE</spring.version>
-		<jsf.version>1.2.0.09</jsf.version>
 	</properties>
 </project>
diff --git a/spring-webflow-samples/booking-portlet-faces/pom.xml b/spring-webflow-samples/booking-portlet-faces/pom.xml
index 8008b914..b9fee1e2 100644
--- a/spring-webflow-samples/booking-portlet-faces/pom.xml
+++ b/spring-webflow-samples/booking-portlet-faces/pom.xml
@@ -128,14 +128,24 @@
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>javax.faces</groupId>
-			<artifactId>com.springsource.javax.faces</artifactId>
-			<version>${jsf.version}</version>
+			<groupId>org.apache.myfaces</groupId>
+			<artifactId>com.springsource.org.apache.myfaces.javax.faces</artifactId>
+			<version>1.2.2</version>
 		</dependency>
 		<dependency>
-			<groupId>com.sun.faces</groupId>
-			<artifactId>com.springsource.com.sun.faces</artifactId>
-			<version>${jsf.version}</version>
+			<groupId>org.apache.myfaces</groupId>
+			<artifactId>com.springsource.org.apache.myfaces</artifactId>
+			<version>1.2.2</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.myfaces.portlet-bridge</groupId>
+			<artifactId>portlet-bridge-api</artifactId>
+			<version>2.0.0-alpha-2</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.myfaces.portlet-bridge</groupId>
+			<artifactId>portlet-bridge-impl</artifactId>
+			<version>2.0.0-alpha-2</version>
 		</dependency>
 		<!-- Build time only dependencies -->
 		<dependency>
diff --git a/spring-webflow-samples/jsf-booking/pom.xml b/spring-webflow-samples/jsf-booking/pom.xml
index 4c8a04d3..d64c04f8 100644
--- a/spring-webflow-samples/jsf-booking/pom.xml
+++ b/spring-webflow-samples/jsf-booking/pom.xml
@@ -8,19 +8,14 @@
 	<version>2.1.0.BUILD-SNAPSHOT</version>
 	<dependencies>
 		<dependency>
-			<groupId>com.sun.facelets</groupId>
-			<artifactId>com.springsource.com.sun.facelets</artifactId>
-			<version>1.1.14</version>
+			<groupId>javax.faces</groupId>
+			<artifactId>jsf-api</artifactId>
+			<version>2.0</version>
 		</dependency>
 		<dependency>
 			<groupId>com.sun.faces</groupId>
-			<artifactId>com.springsource.com.sun.faces</artifactId>
-			<version>${jsf.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>javax.faces</groupId>
-			<artifactId>com.springsource.javax.faces</artifactId>
-			<version>${jsf.version}</version>
+			<artifactId>jsf-impl</artifactId>
+			<version>2.0.2</version>
 		</dependency>
 		<dependency>
 			<groupId>javax.persistence</groupId>
@@ -30,7 +25,7 @@
 		<dependency>
 			<groupId>javax.servlet</groupId>
 			<artifactId>com.springsource.javax.servlet.jsp.jstl</artifactId>
-			<version>1.1.2</version>
+			<version>1.2.0</version>
 		</dependency>
 		<dependency>
 			<groupId>javax.transaction</groupId>
@@ -150,6 +145,11 @@
 			<name>SpringSource Enterprise Bundle Repository - External Releases</name>
 			<url>http://repository.springsource.com/maven/bundles/external</url>
 		</repository>
+		<repository>
+			<id>java.net.release</id>
+			<name>Repository for Projects On Hosted on java.net</name>
+			<url>http://download.java.net/maven/2</url>
+		</repository>
 	</repositories>
 	<build>
 		<finalName>jsf-booking</finalName>
@@ -166,6 +166,5 @@
 	</build>
 	<properties>
 		<spring.version>3.0.2.RELEASE</spring.version>
-		<jsf.version>1.2.0.09</jsf.version>
 	</properties>
 </project>