diff --git a/RELEASE-NOTES.html b/RELEASE-NOTES.html
index 750296492..bf780ed1f 100644
--- a/RELEASE-NOTES.html
+++ b/RELEASE-NOTES.html
@@ -13,9 +13,9 @@
    See the License for the specific language governing permissions and
    limitations under the License.
   -->
-<title>RELEASE NOTES: COLLECTIONS 3.1-RC1</title>
+<title>RELEASE NOTES: COLLECTIONS 3.1</title>
 
-<center><h2>RELEASE NOTES: COLLECTIONS 3.1-RC1</h2></center>
+<center><h2>RELEASE NOTES: COLLECTIONS 3.1</h2></center>
 
 <p>
 This release adds various new classes and fixes a number of bugs.
@@ -27,6 +27,7 @@ All feedback should be directed to commons-user at jakarta.apache.org.
 <center><h3>COMPATABILITY</h3></center>
 <p>
 This release is fully source and binary compatible with v3.0.
+(Checks performed using JDiff and Clirr, thanks).
 </p>
 <p>
 This release also enables a workaround of the binary compatability issue with IteratorUtils in v3.0.
diff --git a/build.xml b/build.xml
index f41e3bb66..87aab6dee 100644
--- a/build.xml
+++ b/build.xml
@@ -35,7 +35,7 @@
   <property name="component.title.full"    value="Apache Jakarta Commons Collections"/>
 
   <!-- The current version number of this component -->
-  <property name="component.version"       value="3.1-RC1"/>
+  <property name="component.version"       value="3.1"/>
 
   <!-- The base directory for component configuration files -->
   <property name="source.conf"               value="src/conf"/>
diff --git a/maven.xml b/maven.xml
index c9013905e..255306e40 100644
--- a/maven.xml
+++ b/maven.xml
@@ -165,6 +165,10 @@
     <j:set var="collections.javadoc.tag.windowtitle" value="Collections 3.0 release API" />
     <j:set var="collections.javadoc.tag.overview" value="src/java/org/apache/commons/collections/overview.html" />
     <attainGoal name="javadoc:generate" />
+    <j:set var="collections.javadoc.tag" value="COLLECTIONS_3_1" />
+    <j:set var="collections.javadoc.tag.windowtitle" value="Collections 3.1 release API" />
+    <j:set var="collections.javadoc.tag.overview" value="src/java/org/apache/commons/collections/overview.html" />
+    <attainGoal name="javadoc:generate" />
   </postGoal>
   <postGoal name="site:generate"><!-- NEW MAVEN -->
     <j:set var="collections.javadoc.tag" value="COLLECTIONS_2_1_1" />
@@ -173,6 +177,9 @@
     <j:set var="collections.javadoc.tag" value="COLLECTIONS_3_0" />
     <j:set var="collections.javadoc.tag.windowtitle" value="Collections 3.0 release API" />
     <j:set var="collections.javadoc.tag.overview" value="src/java/org/apache/commons/collections/overview.html" />
+    <j:set var="collections.javadoc.tag" value="COLLECTIONS_3_1" />
+    <j:set var="collections.javadoc.tag.windowtitle" value="Collections 3.1 release API" />
+    <j:set var="collections.javadoc.tag.overview" value="src/java/org/apache/commons/collections/overview.html" />
     <attainGoal name="javadoc:generate" />
   </postGoal>
   
diff --git a/project.xml b/project.xml
index bbd7cf302..7672d9562 100644
--- a/project.xml
+++ b/project.xml
@@ -17,7 +17,7 @@
 <project>
   <pomVersion>3</pomVersion>
   <id>commons-collections</id>
-  <currentVersion>3.1-RC1</currentVersion>
+  <currentVersion>3.1</currentVersion>
   <inceptionYear>2001</inceptionYear>
   <name>Collections</name>
   <shortDescription>Commons Collections</shortDescription>
diff --git a/xdocs/history.xml b/xdocs/history.xml
index 74c86cbd7..d0e58625d 100644
--- a/xdocs/history.xml
+++ b/xdocs/history.xml
@@ -84,12 +84,14 @@ Of course, backwards compatibility has been retained during all transitions usin
 
 <p>
 <b>Collections 2.1.1</b> is a patch release to v2.1.
-Unfortunately, v3.0 created a binary incompatibility in the IteratorUtils class.
+Unfortunately, v3.0 created a <a href="compatibility.html">binary incompatibility</a> in the IteratorUtils class.
 This patch was created as a work around, enabling v2.1.1 to be compatible with v3.1.
 </p>
 
 <p>
-<b>Collections 3.1</b> (due soon) fixes some bugs in v3.0 and adds a few new enhancements.
+<b>Collections 3.1</b> fixes some bugs in v3.0 and adds a few new enhancements.
+The most notable change is a new list implementation, TreeList, that is well balanced for insertions and removals at any index.
+Other changes include more classes implementing Serializable and a ReferenceIdentityMap.
 </p>
 
 </section>
diff --git a/xdocs/index.xml b/xdocs/index.xml
index 934fecf72..70febefde 100644
--- a/xdocs/index.xml
+++ b/xdocs/index.xml
@@ -53,7 +53,7 @@ There are many features, including:
 </ul>
 </p>
 <p>
-Preview version 3.1-RC1 and patch version 2.1.1 have just been released.
+Version 3.1 and patch version 2.1.1 have just been released.
 These provides a work around to a <a href="compatibility.html">version compatibility</a> issue between v2.1 and v3.0.
 </p>
 </section>
@@ -67,7 +67,7 @@ A getting started<span> </span><a href="userguide.html">User's Guide</a> is avai
 The JavaDoc API documents are available online:
 </p>
 <ul>
-<li>The <a href="apidocs-COLLECTIONS_3_0/index.html">current release 3.0</a></li>
+<li>The <a href="apidocs-COLLECTIONS_3_1/index.html">current release 3.1</a></li>
 <li>The <a href="apidocs-COLLECTIONS_2_1_1/index.html">previous version 2.1.1</a></li>
 <li>The <a href="apidocs/index.html">latest CVS</a></li>
 </ul>
@@ -79,14 +79,10 @@ The <a href="http://cvs.apache.org/viewcvs/jakarta-commons/collections/">CVS rep
 
 <section name="Releases">
 <p>
-Version 3.0/2.1.1 - 
+Version 3.1/2.1.1 - 
  <a href="http://jakarta.apache.org/site/binindex.cgi#commons-collections">Binary</a> - 
  <a href="http://jakarta.apache.org/site/sourceindex.cgi#commons-collections">Source</a>
 </p>
-<p>
-Version 3.1-RC1 (preview for testing - not for production use) - 
- <a href="http://www.apache.org/~scolebourne/coll31/">Source and binary</a>
-</p>
 <p>
  For previous releases, see the <a href="http://archive.apache.org/dist/jakarta/commons/collections/">Apache Archive</a>
 </p>
diff --git a/xdocs/navigation.xml b/xdocs/navigation.xml
index facf06751..66347b835 100644
--- a/xdocs/navigation.xml
+++ b/xdocs/navigation.xml
@@ -33,12 +33,13 @@
       <item name="Download" href="http://jakarta.apache.org/site/sourceindex.cgi#commons-collections"/>
       <item name="Users guide" href="/userguide.html"/>
       <item name="History" href="/history.html"/>
-      <item name="Javadoc (3.0 release)" href="apidocs-COLLECTIONS_3_0/index.html"/>
+      <item name="Javadoc (3.1 release)" href="apidocs-COLLECTIONS_3_1/index.html"/>
       <item name="Mailing lists" href="/mail-lists.html"/>
       <item name="Team" href="/team-list.html"/>
       <item name="Tasks" href="/tasks.html"/>
       <item name="CVS" href="http://cvs.apache.org/viewcvs/jakarta-commons/collections/"/>
       <item name="Javadoc (CVS latest)" href="apidocs/index.html"/>
+      <item name="Javadoc (3.0 old)" href="apidocs-COLLECTIONS_3_0/index.html"/>
       <item name="Javadoc (2.1.1 old)" href="apidocs-COLLECTIONS_2_1_1/index.html"/>
     </menu>
     
diff --git a/xdocs/tasks.xml b/xdocs/tasks.xml
index 09e917823..fba665853 100644
--- a/xdocs/tasks.xml
+++ b/xdocs/tasks.xml
@@ -32,6 +32,7 @@ but please contact the mailing list before starting work:
 </p>
 
 <ul>
+<li>MultiValueMap decorator</li>
 <li>Synchronized BidiMap decorators</li>
 <li>IdentitySet</li>
 <li>BidiMapUtils</li>