diff --git a/build/release/build_release.sh b/build/release/build_release.sh
index aedd298e288..0d68e11c680 100755
--- a/build/release/build_release.sh
+++ b/build/release/build_release.sh
@@ -136,6 +136,7 @@ pushd tags/$tag > /dev/null
 # update versions
 pushd build > /dev/null
 sed -i 's/@VERSION@/'$tag'/g' rename.xml 
+sed -i "s/@RELEASE_DATE@/`date "+%b %d, %Y"`/g" rename.xml 
 ant -f rename.xml
 popd > /dev/null
 
diff --git a/build/rename.xml b/build/rename.xml
index a46cf378574..bfa2f472930 100644
--- a/build/rename.xml
+++ b/build/rename.xml
@@ -8,37 +8,21 @@
   <target name="code">
     <replace dir="..">
       <include name="**/pom.xml"/>
-      <replacefilter token="&lt;version&gt;8-SNAPSHOT&lt;/version&gt;"
-                     value="&lt;version&gt;@VERSION@&lt;/version&gt;"/>
-    </replace>
-    
-    <replace dir="../modules/library/metadata/src/main/java/org/geotools/factory">
-      <include name="GeoTools.java"/>
-     <replacefilter token="8-SNAPSHOT"
-                     value="@VERSION@"/>
+      <include name="**/GeoTools.java"/>
+      <replacefilter token="8-SNAPSHOT" value="@VERSION@"/>
     </replace>
   </target>
   
   <target name="doc">
-    <replace dir="../docs/user/tutorial/">
-      <include name="**/pom.xml"/>
-      <replacefilter token="&lt;geotools.version&gt;8-SNAPSHOT&lt;/geotools.version&gt;"
-                     value="&lt;geotools.version&gt;@VERSION@&lt;/geotools.version&gt;"/>
-    </replace>
-    
-    <replace dir="../docs/">
-      <include name="pom.xml"/>
-      <replacefilter token="8-SNAPSHOT"
-                     value="@VERSION@"/>
+    <replace file="../docs/common.py">
+      <replacefilter token="@RELEASE@" value="@VERSION@"/>
     </replace>
   </target>
   
-    <target name="readme">
+  <target name="readme">
     <replace file="../README.html">
-      <replacefilter token="@RELEASE@"
-                     value="@VERSION@"/>
-      <replacefilter token="@DATE@"
-                     value="@RELEASE_DATE@"/>
+      <replacefilter token="@RELEASE@" value="@VERSION@"/>
+      <replacefilter token="@DATE@" value="@RELEASE_DATE@"/>
     </replace>
   </target>
 
diff --git a/docs/build.xml b/docs/build.xml
index 4967ebb76bc..40dd2a97871 100644
--- a/docs/build.xml
+++ b/docs/build.xml
@@ -26,7 +26,7 @@
 			<isset property="build.directory" />
 		</condition>
 
-        <condition property="project.version" value="${project.version}" else="8.0-M3">
+        <condition property="project.version" value="${project.version}" else="8-SNAPSHOT">
 			<isset property="project.version" />
 		</condition>
 
diff --git a/docs/common.py b/docs/common.py
index 480b613c7f4..eca83d2ec3e 100644
--- a/docs/common.py
+++ b/docs/common.py
@@ -12,6 +12,7 @@
 # serve to show the default.
 
 import sys, os
+import re
 
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
@@ -47,11 +48,12 @@
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
+# The full version, including alpha/beta/rc tags.
+release = '@RELEASE@'
+
 # The short X.Y version.
-version = '8.0'
+version = re.sub('-.*', '', release)
 
-# The full version, including alpha/beta/rc tags.
-release = '8.0-RC1'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/docs/pom.xml b/docs/pom.xml
index a6e5d20bd6b..195b8fc8455 100644
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -240,7 +240,7 @@
                 <ant antfile="build.xml" dir="${basedir}" target="${target}">
                   <property name="build.directory" value="${build.directory}"/>
                   <!-- may be ${project.version} when tagged -->
-                  <property name="project.version" value="8.0-RC1"/>
+                  <property name="project.version" value="${project.version}"/>
                 </ant>
               </tasks>
             </configuration>
diff --git a/docs/user/tutorial/advanced/artifacts/pom.xml b/docs/user/tutorial/advanced/artifacts/pom.xml
index 4b9bcce95f8..ad3ac14d4c5 100644
--- a/docs/user/tutorial/advanced/artifacts/pom.xml
+++ b/docs/user/tutorial/advanced/artifacts/pom.xml
@@ -11,7 +11,7 @@
  <url>http://maven.apache.org</url>
 
  <properties>
-  <geotools.version>8.0-M4</geotools.version>
+  <geotools.version>8-SNAPSHOT</geotools.version>
  </properties>
 
   <dependencies>
diff --git a/docs/user/tutorial/feature/artifacts/pom.xml b/docs/user/tutorial/feature/artifacts/pom.xml
index 3a68e099350..039cc8834de 100644
--- a/docs/user/tutorial/feature/artifacts/pom.xml
+++ b/docs/user/tutorial/feature/artifacts/pom.xml
@@ -11,7 +11,7 @@
  <url>http://maven.apache.org</url>
 
  <properties>
-  <geotools.version>8.0-M4</geotools.version>
+  <geotools.version>8-SNAPSHOT</geotools.version>
  </properties>
 
  <dependencies>
diff --git a/docs/user/tutorial/filter/artifacts/pom.xml b/docs/user/tutorial/filter/artifacts/pom.xml
index 403e81e2253..e591bb9cae5 100644
--- a/docs/user/tutorial/filter/artifacts/pom.xml
+++ b/docs/user/tutorial/filter/artifacts/pom.xml
@@ -11,7 +11,7 @@
     <url>http://maven.apache.org</url>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <geotools.version>8.0-M4</geotools.version>
+        <geotools.version>8-SNAPSHOT</geotools.version>
     </properties>
     <dependencies>
         <!-- Provides map projections -->
diff --git a/docs/user/tutorial/geometry/artifacts/pom.xml b/docs/user/tutorial/geometry/artifacts/pom.xml
index 62491d25a66..003e0e07548 100644
--- a/docs/user/tutorial/geometry/artifacts/pom.xml
+++ b/docs/user/tutorial/geometry/artifacts/pom.xml
@@ -11,7 +11,7 @@
     <url>http://maven.apache.org</url>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <geotools.version>8.0-M4</geotools.version>
+        <geotools.version>8-SNAPSHOT</geotools.version>
     </properties>
     <dependencies>
         <dependency>
diff --git a/docs/user/tutorial/map/artifacts/pom.xml b/docs/user/tutorial/map/artifacts/pom.xml
index 9c4ff6ba696..ac841b9e443 100644
--- a/docs/user/tutorial/map/artifacts/pom.xml
+++ b/docs/user/tutorial/map/artifacts/pom.xml
@@ -11,7 +11,7 @@
     <url>http://maven.apache.org</url>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <geotools.version>8.0-M4</geotools.version>
+        <geotools.version>8-SNAPSHOT</geotools.version>
     </properties>
     <dependencies>
         <dependency>
diff --git a/docs/user/tutorial/quickstart/artifacts/pom.xml b/docs/user/tutorial/quickstart/artifacts/pom.xml
index 4955cd7a688..b198acb702b 100644
--- a/docs/user/tutorial/quickstart/artifacts/pom.xml
+++ b/docs/user/tutorial/quickstart/artifacts/pom.xml
@@ -11,7 +11,7 @@
     <url>http://maven.apache.org</url>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <geotools.version>8.0-RC1</geotools.version>
+        <geotools.version>8-SNAPSHOT</geotools.version>
     </properties>
     <dependencies>
         <dependency>
diff --git a/docs/user/tutorial/raster/artifacts/pom.xml b/docs/user/tutorial/raster/artifacts/pom.xml
index 8e493e78598..15e0d89d0c9 100644
--- a/docs/user/tutorial/raster/artifacts/pom.xml
+++ b/docs/user/tutorial/raster/artifacts/pom.xml
@@ -11,7 +11,7 @@
     <url>http://maven.apache.org</url>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <geotools.version>8.0-M4</geotools.version>
+        <geotools.version>8-SNAPSHOT</geotools.version>
     </properties>
     <dependencies>
         <dependency>
diff --git a/modules/unsupported/wfs-ng/pom.xml b/modules/unsupported/wfs-ng/pom.xml
index 0ad0168a01d..73e817c9727 100644
--- a/modules/unsupported/wfs-ng/pom.xml
+++ b/modules/unsupported/wfs-ng/pom.xml
@@ -105,9 +105,9 @@
       <version>${project.version}</version>
     </dependency>
     <dependency>
-          <groupId>org.geotools</groupId>
-          <artifactId>gt-data</artifactId>
-          <version>2.7-SNAPSHOT</version>
+      <groupId>org.geotools</groupId>
+      <artifactId>gt-data</artifactId>
+      <version>${project.version}</version>
       <type>jar</type>
     </dependency>
     <dependency>