diff --git a/build.properties b/build.properties
index 2b7b004d..eeeb3aba 100644
--- a/build.properties
+++ b/build.properties
@@ -1,4 +1,4 @@
-version=2.1.1
+version=2.1.2
 release.type=integration
 natural.name=spring-webflow
 project.key=SWF
diff --git a/spring-binding/pom.xml b/spring-binding/pom.xml
index b453dbdd..343167a8 100644
--- a/spring-binding/pom.xml
+++ b/spring-binding/pom.xml
@@ -5,7 +5,7 @@
 	<artifactId>spring-binding</artifactId>
 	<packaging>jar</packaging>
 	<name>Spring Binding</name>
-	<version>2.1.1.BUILD-SNAPSHOT</version>
+	<version>2.1.2.BUILD-SNAPSHOT</version>
 	<dependencies>
 		<dependency>
 			<groupId>commons-logging</groupId>
diff --git a/spring-faces/pom.xml b/spring-faces/pom.xml
index f01b2db9..5e697c21 100644
--- a/spring-faces/pom.xml
+++ b/spring-faces/pom.xml
@@ -5,7 +5,7 @@
 	<artifactId>spring-faces</artifactId>
 	<packaging>jar</packaging>
 	<name>Spring Faces</name>
-	<version>2.1.1.BUILD-SNAPSHOT</version>
+	<version>2.1.2.BUILD-SNAPSHOT</version>
 	<dependencies>
 		<dependency>
 			<groupId>commons-logging</groupId>
diff --git a/spring-faces/template.mf b/spring-faces/template.mf
index b46a25ae..a5bbecd2 100644
--- a/spring-faces/template.mf
+++ b/spring-faces/template.mf
@@ -3,11 +3,11 @@ Bundle-Name: Spring Faces
 Bundle-Vendor: SpringSource
 Bundle-ManifestVersion: 2
 Import-Package: 
- org.springframework.webflow.engine.builder.support;version="[2.1.0, 2.1.1)"
+ org.springframework.webflow.engine.builder.support;version="[2.1.0, 2.2.0)"
 Import-Template: 
- org.springframework.binding.*;version="[2.1.0, 2.1.1)",
- org.springframework.js.*;version="[2.1.0, 2.1.1)",
- org.springframework.webflow.*;version="[2.1.0, 2.1.1)",
+ org.springframework.binding.*;version="[2.1.0, 2.2.0)",
+ org.springframework.js.*;version="[2.1.0, 2.2.0)",
+ org.springframework.webflow.*;version="[2.1.0, 2.2.0)",
  org.springframework.*;version="[3.0.3.RELEASE, 3.1.0)",
  org.apache.commons.logging;version="[1.1.1, 2.0.0)",
  javax.el;version="[1.0.0, 2.0.0)",
diff --git a/spring-js/pom.xml b/spring-js/pom.xml
index 5b07a7a0..e657b982 100644
--- a/spring-js/pom.xml
+++ b/spring-js/pom.xml
@@ -5,7 +5,7 @@
 	<artifactId>spring-js</artifactId>
 	<packaging>jar</packaging>
 	<name>Spring JavaScript</name>
-	<version>2.1.1.BUILD-SNAPSHOT</version>
+	<version>2.1.2.BUILD-SNAPSHOT</version>
 	<dependencies>
 		<dependency>
 			<groupId>commons-logging</groupId>
diff --git a/spring-webflow-samples/booking-faces/pom.xml b/spring-webflow-samples/booking-faces/pom.xml
index 06112caf..195c39a8 100644
--- a/spring-webflow-samples/booking-faces/pom.xml
+++ b/spring-webflow-samples/booking-faces/pom.xml
@@ -5,7 +5,7 @@
 	<groupId>org.springframework.webflow.samples</groupId>
 	<artifactId>booking-faces</artifactId>
 	<packaging>war</packaging>
-	<version>2.1.1.BUILD-SNAPSHOT</version>
+	<version>2.1.2.BUILD-SNAPSHOT</version>
 	<dependencies>
 		<dependency>
 			<groupId>javax.persistence</groupId>
diff --git a/spring-webflow-samples/booking-mvc/pom.xml b/spring-webflow-samples/booking-mvc/pom.xml
index 13115c17..47c18854 100644
--- a/spring-webflow-samples/booking-mvc/pom.xml
+++ b/spring-webflow-samples/booking-mvc/pom.xml
@@ -5,7 +5,7 @@
 	<groupId>org.springframework.webflow.samples</groupId>
 	<artifactId>booking-mvc</artifactId>
 	<packaging>war</packaging>
-	<version>2.1.1.BUILD-SNAPSHOT</version>
+	<version>2.1.2.BUILD-SNAPSHOT</version>
 	<dependencies>
 		<dependency>
 			<groupId>javax.persistence</groupId>
diff --git a/spring-webflow-samples/booking-portlet-faces/pom.xml b/spring-webflow-samples/booking-portlet-faces/pom.xml
index 2443dc4d..d5aca5d3 100644
--- a/spring-webflow-samples/booking-portlet-faces/pom.xml
+++ b/spring-webflow-samples/booking-portlet-faces/pom.xml
@@ -5,7 +5,7 @@
 	<groupId>org.springframework.webflow.samples</groupId>
 	<artifactId>booking-portlet-faces</artifactId>
 	<packaging>war</packaging>
-	<version>2.1.1.BUILD-SNAPSHOT</version>
+	<version>2.1.2.BUILD-SNAPSHOT</version>
 	<dependencies>
 		<dependency>
 			<groupId>com.sun.facelets</groupId>
diff --git a/spring-webflow-samples/booking-portlet-mvc/pom.xml b/spring-webflow-samples/booking-portlet-mvc/pom.xml
index 30759373..0668b127 100644
--- a/spring-webflow-samples/booking-portlet-mvc/pom.xml
+++ b/spring-webflow-samples/booking-portlet-mvc/pom.xml
@@ -5,7 +5,7 @@
 	<groupId>org.springframework.webflow.samples</groupId>
 	<artifactId>booking-portlet-mvc</artifactId>
 	<packaging>war</packaging>
-	<version>2.1.1.BUILD-SNAPSHOT</version>
+	<version>2.1.2.BUILD-SNAPSHOT</version>
 	<dependencies>
 		<dependency>
 			<groupId>javax.persistence</groupId>
diff --git a/spring-webflow-samples/jsf-booking/pom.xml b/spring-webflow-samples/jsf-booking/pom.xml
index 5531352a..cea19a5a 100644
--- a/spring-webflow-samples/jsf-booking/pom.xml
+++ b/spring-webflow-samples/jsf-booking/pom.xml
@@ -5,7 +5,7 @@
 	<groupId>org.springframework.webflow.samples</groupId>
 	<artifactId>jsf-booking</artifactId>
 	<packaging>war</packaging>
-	<version>2.1.1.BUILD-SNAPSHOT</version>
+	<version>2.1.2.BUILD-SNAPSHOT</version>
 	<dependencies>
 		<dependency>
 			<groupId>javax.faces</groupId>
diff --git a/spring-webflow/pom.xml b/spring-webflow/pom.xml
index 5b85b394..bd1395dd 100644
--- a/spring-webflow/pom.xml
+++ b/spring-webflow/pom.xml
@@ -5,7 +5,7 @@
 	<artifactId>spring-webflow</artifactId>
 	<packaging>jar</packaging>
 	<name>Spring Web Flow</name>
-	<version>2.1.1.BUILD-SNAPSHOT</version>
+	<version>2.1.2.BUILD-SNAPSHOT</version>
 	<dependencies>
 		<dependency>
 			<groupId>commons-logging</groupId>
diff --git a/spring-webflow/template.mf b/spring-webflow/template.mf
index b9b441cd..a43bfe1d 100644
--- a/spring-webflow/template.mf
+++ b/spring-webflow/template.mf
@@ -3,8 +3,8 @@ Bundle-Name: Spring Web Flow
 Bundle-Vendor: SpringSource
 Bundle-ManifestVersion: 2
 Import-Template: 
- org.springframework.binding.*;version="[2.1.0, 2.1.1)",
- org.springframework.js.*;version="[2.1.0, 2.1.1)",
+ org.springframework.binding.*;version="[2.1.0, 2.2.0)",
+ org.springframework.js.*;version="[2.1.0, 2.2.0)",
  org.springframework.*;version="[3.0.3.RELEASE, 3.1.0)",
  org.springframework.orm.*;version="[3.0.3.RELEASE, 3.1.0)";resolution:=optional,
  org.springframework.transaction.*;version="[3.0.3.RELEASE, 3.1.0)";resolution:=optional,