diff --git a/build-spring-webflow/resources/readme.txt b/build-spring-webflow/resources/readme.txt
index 3fd4e6aa..349c6387 100644
--- a/build-spring-webflow/resources/readme.txt
+++ b/build-spring-webflow/resources/readme.txt
@@ -1,4 +1,4 @@
-SPRING WEB FLOW 2.0.6 (March 2009)
+SPRING WEB FLOW 2.0.7 ()
 ----------------------------------
 http://www.springframework.org/webflow
 
@@ -49,21 +49,21 @@ The following jar files are included in the distribution.
 The contents of each jar and its dependencies are noted.
 Dependencies in [brackets] are optional, and are just necessary for certain functionality.
 
-* org.springframework.webflow-2.0.6.RELEASE.jar
+* org.springframework.webflow-2.0.7.RELEASE.jar
 - Contents: The Spring Web Flow system
 - Dependencies: Commons Logging, spring-core, spring-beans, spring-context, spring-binding, spring-web, spring-webmvc-servlet, spring-js
                 [Log4J, Xerces, XML APIs, OGNL, EL API, JPA API, Hibernate, Spring Security, Servlet API, Portlet API, JUnit]
               
-* org.springframework.binding-2.0.6.RELEASE.jar
+* org.springframework.binding-2.0.7.RELEASE.jar
 - Contents: The Spring Data Binding framework, a utility library used by Web Flow
 - Dependencies: Commons Logging, spring-beans, spring-core, spring-context
                 [Log4J, OGNL, EL API]
 
-* org.springframework.js-2.0.6.RELEASE.jar
+* org.springframework.js-2.0.7.RELEASE.jar
 - Contents: The Spring JavaScript module, containing Spring's Dojo integration and additional JavaScript functionality.
 - Dependencies: Dojo Toolkit
 
-* org.springframework.faces-2.0.6.RELEASE.jar
+* org.springframework.faces-2.0.7.RELEASE.jar
 - Contents: The Spring Faces module, containing Spring's integration with Java Server Faces (JSF) and additional JSF functionality.
 - Dependencies: spring-webflow, spring-js, JSF API
                                 
@@ -102,19 +102,19 @@ Then declare the following dependencies:
 <dependency>
     <groupId>org.springframework.webflow</groupId>
     <artifactId>org.springframework.binding</artifactId>
-    <version>2.0.6.RELEASE</version>
+    <version>2.0.7.RELEASE</version>
 </dependency> 
 
 <dependency>
     <groupId>org.springframework.webflow</groupId>
     <artifactId>org.springframework.js</artifactId>
-    <version>2.0.6.RELEASE</version>
+    <version>2.0.7.RELEASE</version>
 </dependency> 
 
 <dependency>
     <groupId>org.springframework.webflow</groupId>
     <artifactId>org.springframework.webflow</artifactId>
-    <version>2.0.6.RELEASE</version>
+    <version>2.0.7.RELEASE</version>
 </dependency> 
 
 If using JavaServerFaces:
@@ -122,7 +122,7 @@ If using JavaServerFaces:
 <dependency>
     <groupId>org.springframework.webflow</groupId>
     <artifactId>org.springframework.faces</artifactId>
-    <version>2.0.6.RELEASE</version>
+    <version>2.0.7.RELEASE</version>
 </dependency> 
 
 To access jars using Ivy, add the following repositories to your Ivy config:
@@ -139,13 +139,13 @@ To access jars using Ivy, add the following repositories to your Ivy config:
 
 Then declare the following dependencies in your ivy.xml:
 
-<dependency org="org.springframework.webflow" name="org.springframework.binding" rev="2.0.6.RELEASE" conf="compile->runtime" />
-<dependency org="org.springframework.webflow" name="org.springframework.js" rev="2.0.6.RELEASE" conf="compile->runtime" />
-<dependency org="org.springframework.webflow" name="org.springframework.webflow" rev="2.0.6.RELEASE" conf="compile->runtime" />
+<dependency org="org.springframework.webflow" name="org.springframework.binding" rev="2.0.7.RELEASE" conf="compile->runtime" />
+<dependency org="org.springframework.webflow" name="org.springframework.js" rev="2.0.7.RELEASE" conf="compile->runtime" />
+<dependency org="org.springframework.webflow" name="org.springframework.webflow" rev="2.0.7.RELEASE" conf="compile->runtime" />
 
 If using JavaServerFaces:
 
-<dependency org="org.springframework.webflow" name="org.springframework.faces" rev="2.0.6.RELEASE" conf="compile->runtime" />
+<dependency org="org.springframework.webflow" name="org.springframework.faces" rev="2.0.7.RELEASE" conf="compile->runtime" />
 
 Refer to the reference documentation for more coverage on obtaining Web Flow jars using Maven or Ivy.
 	
diff --git a/build.properties b/build.properties
index 7a513f74..139b6a92 100644
--- a/build.properties
+++ b/build.properties
@@ -1,4 +1,4 @@
-version=2.0.6
+version=2.0.7
 release.type=integration
 natural.name=spring-webflow
 project.key=SWF
diff --git a/spring-binding/pom.xml b/spring-binding/pom.xml
index a283bdfd..8740b612 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.0.6.RELEASE</version>
+	<version>2.0.7.RELEASE</version>
 	<dependencies>
 		<dependency>
 			<groupId>commons-logging</groupId>
diff --git a/spring-faces/pom.xml b/spring-faces/pom.xml
index c3242283..a165c6d7 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.0.6.RELEASE</version>
+	<version>2.0.7.RELEASE</version>
 	<dependencies>
 		<dependency>
 			<groupId>commons-logging</groupId>
diff --git a/spring-faces/template.mf b/spring-faces/template.mf
index 148b2ef9..93470fc1 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.0.6, 2.0.7)"
+ org.springframework.webflow.engine.builder.support;version="[2.0.7, 2.0.8)"
 Import-Template: 
- org.springframework.binding.*;version="[2.0.6, 2.0.7)",
- org.springframework.js.*;version="[2.0.6, 2.0.7)",
- org.springframework.webflow.*;version="[2.0.6, 2.0.7)",
+ org.springframework.binding.*;version="[2.0.7, 2.0.8)",
+ org.springframework.js.*;version="[2.0.7, 2.0.8)",
+ org.springframework.webflow.*;version="[2.0.7, 2.0.8)",
  org.springframework.*;version="[2.5.6.A, 3.0.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 9e98b84c..f8d821c8 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.0.6.RELEASE</version>
+	<version>2.0.7.RELEASE</version>
 	<dependencies>
 		<dependency>
 			<groupId>commons-logging</groupId>
diff --git a/spring-webflow-reference/src/overview.xml b/spring-webflow-reference/src/overview.xml
index 934e561c..f35dbdd7 100644
--- a/spring-webflow-reference/src/overview.xml
+++ b/spring-webflow-reference/src/overview.xml
@@ -92,19 +92,19 @@
 <dependency>
     <groupId>org.springframework.webflow</groupId>
     <artifactId>org.springframework.binding</artifactId>
-    <version>2.0.6.RELEASE</version>
+    <version>2.0.7.RELEASE</version>
 </dependency> 
 
 <dependency>
     <groupId>org.springframework.webflow</groupId>
     <artifactId>org.springframework.js</artifactId>
-    <version>2.0.6.RELEASE</version>
+    <version>2.0.7.RELEASE</version>
 </dependency> 
 
 <dependency>
     <groupId>org.springframework.webflow</groupId>
     <artifactId>org.springframework.webflow</artifactId>
-    <version>2.0.6.RELEASE</version>
+    <version>2.0.7.RELEASE</version>
 </dependency> 
 ]]>
 			</programlisting>
@@ -115,7 +115,7 @@
 <dependency>
     <groupId>org.springframework.webflow</groupId>
     <artifactId>org.springframework.faces</artifactId>
-    <version>2.0.6.RELEASE</version>
+    <version>2.0.7.RELEASE</version>
 </dependency> 
 ]]>
 			</programlisting>
@@ -145,11 +145,11 @@
 			</para>
 			<programlisting language="xml"><![CDATA[
 <dependency org="org.springframework.webflow" name="org.springframework.binding"
-            rev="2.0.6.RELEASE" conf="compile->runtime" />
+            rev="2.0.7.RELEASE" conf="compile->runtime" />
 <dependency org="org.springframework.webflow" name="org.springframework.js"
-            rev="2.0.6.RELEASE" conf="compile->runtime" />
+            rev="2.0.7.RELEASE" conf="compile->runtime" />
 <dependency org="org.springframework.webflow" name="org.springframework.webflow"
-            rev="2.0.6.RELEASE" conf="compile->runtime" />
+            rev="2.0.7.RELEASE" conf="compile->runtime" />
 ]]>
 			</programlisting>
 			<para>
@@ -157,7 +157,7 @@
 			</para>
 			<programlisting language="xml"><![CDATA[
 <dependency org="org.springframework.webflow" name="org.springframework.faces"
-            rev="2.0.6.RELEASE" conf="compile->runtime" />
+            rev="2.0.7.RELEASE" conf="compile->runtime" />
 ]]>
 			</programlisting>
 		</sect2>
@@ -175,19 +175,19 @@
 <dependency>
     <groupId>org.springframework.webflow</groupId>
     <artifactId>spring-binding</artifactId>
-    <version>2.0.6.RELEASE</version>
+    <version>2.0.7.RELEASE</version>
 </dependency> 
 
 <dependency>
     <groupId>org.springframework.webflow</groupId>
     <artifactId>spring-js</artifactId>
-    <version>2.0.6.RELEASE</version>
+    <version>2.0.7.RELEASE</version>
 </dependency> 
 
 <dependency>
     <groupId>org.springframework.webflow</groupId>
     <artifactId>spring-webflow</artifactId>
-    <version>2.0.6.RELEASE</version>
+    <version>2.0.7.RELEASE</version>
 </dependency>
 ]]>
 		</programlisting>
@@ -198,7 +198,7 @@
 <dependency>
     <groupId>org.springframework.webflow</groupId>
     <artifactId>spring-faces</artifactId>
-    <version>2.0.6.RELEASE</version>
+    <version>2.0.7.RELEASE</version>
 </dependency> 
 ]]>
 		</programlisting>
diff --git a/spring-webflow-reference/src/spring-webflow-reference.xml b/spring-webflow-reference/src/spring-webflow-reference.xml
index 8d8e5670..3db41b7d 100644
--- a/spring-webflow-reference/src/spring-webflow-reference.xml
+++ b/spring-webflow-reference/src/spring-webflow-reference.xml
@@ -24,7 +24,7 @@
 	<bookinfo>
 		<title>Spring Web Flow Reference Guide</title>
 		<productname>Spring Web Flow</productname>
-		<releaseinfo>Version 2.0.6</releaseinfo>
+		<releaseinfo>Version 2.0.7</releaseinfo>
 		<pubdate>March 2009</pubdate>
 		<authorgroup>
 			<author>
diff --git a/spring-webflow-samples/booking-faces/pom.xml b/spring-webflow-samples/booking-faces/pom.xml
index f763459c..e5ad32b4 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>swf-booking-faces</artifactId>
 	<packaging>war</packaging>
-	<version>2.0.6.BUILD-SNAPSHOT</version>
+	<version>2.0.7.BUILD-SNAPSHOT</version>
 	<dependencies>
 		<dependency>
 			<groupId>com.sun.facelets</groupId>
diff --git a/spring-webflow-samples/booking-mvc/pom.xml b/spring-webflow-samples/booking-mvc/pom.xml
index 3b463ede..e4a45474 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.0.6.BUILD-SNAPSHOT</version>
+	<version>2.0.7.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 427a1962..85d67064 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.0.6.BUILD-SNAPSHOT</version>
+	<version>2.0.7.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 327414c1..ef720c8f 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.0.6.BUILD-SNAPSHOT</version>
+	<version>2.0.7.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 dc2a12f6..97105cc7 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.0.6.BUILD-SNAPSHOT</version>
+	<version>2.0.7.BUILD-SNAPSHOT</version>
 	<dependencies>
 		<dependency>
 			<groupId>com.sun.facelets</groupId>
diff --git a/spring-webflow/pom.xml b/spring-webflow/pom.xml
index cfbd7fb1..8f0eb887 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.0.6.RELEASE</version>
+	<version>2.0.7.RELEASE</version>
 	<dependencies>
 		<dependency>
 			<groupId>commons-logging</groupId>
diff --git a/spring-webflow/template.mf b/spring-webflow/template.mf
index 6021b709..1c97ab97 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.0.6, 2.0.7)",
- org.springframework.js.*;version="[2.0.6, 2.0.7)",
+ org.springframework.binding.*;version="[2.0.7, 2.0.8)",
+ org.springframework.js.*;version="[2.0.7, 2.0.8)",
  org.springframework.*;version="[2.5.6.A, 3.0.0)",
  org.springframework.orm.*;version="[2.5.6.A, 3.0.0)";resolution:=optional,
  org.springframework.transaction.*;version="[2.5.6.A, 3.0.0)";resolution:=optional,