diff --git a/README.md b/README.md
index 474ef6d10..9aa868de7 100644
--- a/README.md
+++ b/README.md
@@ -46,11 +46,11 @@ Various documentation is available:
 
 
 ### Releases
-[Release 2.4](http://www.joda.org/joda-time/download.html) is the current latest release.
+[Release 2.5](http://www.joda.org/joda-time/download.html) is the current latest release.
 This release is considered stable and worthy of the 1.x tag.
 It depends on JDK 1.5 or later.
 
-Available in the [Maven Central repository](http://search.maven.org/#artifactdetails|joda-time|joda-time|2.4|jar)
+Available in the [Maven Central repository](http://search.maven.org/#artifactdetails|joda-time|joda-time|2.5|jar)
 
 
 ### Related projects
diff --git a/pom.xml b/pom.xml
index 780b6c848..ee50f35ac 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
   <artifactId>joda-time</artifactId>
   <packaging>jar</packaging>
   <name>Joda-Time</name>
-  <version>2.5-SNAPHOT</version>
+  <version>2.5</version>
   <description>Date and time library to replace JDK date handling</description>
   <url>http://www.joda.org/joda-time/</url>
 
diff --git a/src/conf/MANIFEST.MF b/src/conf/MANIFEST.MF
index aafc39dce..96eba7b3d 100644
--- a/src/conf/MANIFEST.MF
+++ b/src/conf/MANIFEST.MF
@@ -2,22 +2,22 @@ Package: org.joda.time
 Extension-Name: joda-time
 Specification-Title: Joda-Time
 Specification-Vendor: Joda.org
-Specification-Version: 2.4
+Specification-Version: 2.5
 Implementation-Vendor: Joda.org
 Implementation-Title: org.joda.time
-Implementation-Version: 2.4
+Implementation-Version: 2.5
 Implementation-Vendor-Id: org.joda
 Bundle-ManifestVersion: 2
 Bundle-Vendor: Joda.org
 Bundle-Name: Joda-Time
 Bundle-SymbolicName: joda-time
-Bundle-Version: 2.4
-Export-Package: org.joda.time;version=2.4,
- org.joda.time.base;version=2.4,
- org.joda.time.chrono;version=2.4,
- org.joda.time.convert;version=2.4,
- org.joda.time.field;version=2.4,
- org.joda.time.format;version=2.4,
- org.joda.time.tz;version=2.4
+Bundle-Version: 2.5
+Export-Package: org.joda.time;version=2.5,
+ org.joda.time.base;version=2.5,
+ org.joda.time.chrono;version=2.5,
+ org.joda.time.convert;version=2.5,
+ org.joda.time.field;version=2.5,
+ org.joda.time.format;version=2.5,
+ org.joda.time.tz;version=2.5
 Bundle-License: Apache 2.0
 Bundle-DocURL: http://www.joda.org/joda-time/
diff --git a/src/site/xdoc/index.xml b/src/site/xdoc/index.xml
index 20c2629f0..0f098e719 100644
--- a/src/site/xdoc/index.xml
+++ b/src/site/xdoc/index.xml
@@ -54,7 +54,7 @@ public boolean isJoinedInLastThreeMonths(<a href="apidocs/org/joda/time/DateTime
   return last3Months.contains(datetimeJoined);
 }
 -->
-Version 2.4 was released on 2014-07-27 -
+Version 2.5 was released on 2014-10-03 -
 <a href="download.html">Download now</a>
 </p>
 </section>
@@ -140,14 +140,14 @@ Various documentation is available:
 
 <section name="Releases">
 <p>
-<a href="download.html">Release 2.4</a>
+<a href="download.html">Release 2.5</a>
 is the current latest release.
 This release is an evolution of the 1.x codebase, not a major rewrite.
 It is considered stable and worthy of the 2.x tag.
 </p>
 <p>
-Version 2.4 is a bugfix release compatible with version 2.3.
-See the <a href="upgradeto240.html">upgrade notes</a> for full details.
+Version 2.5 is a bugfix release compatible with version 2.x.
+See the <a href="upgradeto250.html">upgrade notes</a> for full details.
 </p>
 <p>
 Version 2.x is almost completely source and binary compatible with version 1.x.
@@ -161,7 +161,7 @@ The main public API will remain backwards compatible for both source and binary
 The version number will change to 3.0 to indicate a significant change in compatibility.
 </p>
 <p>
-Available in <a href="http://search.maven.org/#artifactdetails|joda-time|joda-time|2.4|jar">Maven Central</a>.
+Available in <a href="http://search.maven.org/#artifactdetails|joda-time|joda-time|2.5|jar">Maven Central</a>.
 </p>
 
 <p>
diff --git a/src/site/xdoc/installation.xml b/src/site/xdoc/installation.xml
index e0e3cac46..6b6270833 100644
--- a/src/site/xdoc/installation.xml
+++ b/src/site/xdoc/installation.xml
@@ -22,6 +22,7 @@ of the source code suitable for linking to the jar file in IDEs such as Eclipse.
 <p>
 The release notes for upgraders can be found here:
 <ul>
+<li><a href="upgradeto250.html">Version 2.5</a> - upgrade from Version 2.4</li>
 <li><a href="upgradeto240.html">Version 2.4</a> - upgrade from Version 2.3</li>
 <li><a href="upgradeto230.html">Version 2.3</a> - upgrade from Version 2.2</li>
 <li><a href="upgradeto220.html">Version 2.2</a> - upgrade from Version 2.1</li>
diff --git a/src/site/xdoc/upgradeto250.xml b/src/site/xdoc/upgradeto250.xml
new file mode 100644
index 000000000..f67b639af
--- /dev/null
+++ b/src/site/xdoc/upgradeto250.xml
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<document>
+ <properties>
+  <title>Java date and time API - Upgrade from 2.4 to 2.5</title>
+  <author>Stephen Colebourne</author>
+ </properties>
+
+<body>
+
+<section name="Upgrade">
+<p>
+These are the release notes and advice for upgrading Joda-Time from version 2.4 to version 2.5.
+<source>
+Joda-Time version 2.5
+---------------------
+
+Joda-Time is a date and time handling library that seeks to replace the JDK
+Date and Calendar classes.
+
+This release contains enhancements, bug fixes and a time zone update.
+The release runs on JDK 5 or later.
+
+Joda-Time is licensed under the business-friendly Apache License Version 2.
+This is the same license as all of Apache, plus other open source projects such as Spring.
+The intent is to make the code available to the Java community with the minimum
+of restrictions. If the license causes you problems please contact the mailing list.
+
+**  Please also check out our related projects   **
+** http://www.joda.org/joda-time/related.html **
+
+
+Enhancements since 2.4
+----------------------
+- Add regex based Period formatting [#166]
+  Regex based formatting allows for languages with more complex rules, such as Polish
+
+- Add time-zone database version to manifest [#176, #183]
+  The version is available as key 'Time-Zone-Database-Version'
+
+
+Compatibility with 2.4
+----------------------
+Build system - Yes
+
+Binary compatible - Yes
+
+Source compatible - Yes, except
+ - The constant DateTimeZone.UTC has changed implementation type
+   It used to be a FixedDateTimeZone, now it is a UTCDateTimeZone
+   This avoids a potential deadlock scenario
+   Serialization is unaffected
+   This change will only be observable if you cast the UTC constant to FixedDateTimeZone
+
+Serialization compatible - Yes
+
+Data compatible - Yes, except
+ - DateTimeZone data updated to version 2014h
+ - Bug in time zone compilation fixed
+
+Semantic compatible - Yes, except
+ - LocalDate.toDateTime(LocalTime) and LocalDate.toDateTime(LocalTime, DateTimeZone)
+   If you pass a null LocalTime to the method, no changes have been made
+   If you pass a non-null LocalTime then behaviour during daylight saving gap and overlap has changed
+   During a daylight saving gap the exception has changed from IllegalFieldValueException to IllegalInstantException
+   During a daylight saving overlap the earlier offset is selected
+   Previously, the earlier offset was chosen east of Greenwich and the later offset west of Greenwich
+
+
+Deprecations since 2.4
+----------------------
+
+
+Bug fixes since 2.4
+-------------------
+- Time zone compiler failed to correctly process 24:00 [#173, #182]
+  This caused reported time to be wrong in Africa/Cairo (and possibly others)
+
+- Additional overflow check for Duration constructor [#159]
+  Handle MIN/MAX value better.
+
+- Handle complex prefix/suffix combinations [#154, #169]
+  For example, 'm' for minutes and 'ms' for milliseconds
+  which both start with 'm'
+
+- Fix deadlock [#171]
+  Referencing DateTimeZone and FixedDateTimeZone from two threads at startup could deadlock
+  Add package scoped UTCDateTimeZone class to avoid this
+
+- Use of current time when converting from LocalDate [#177]
+  LocalDate.toDateTime(LocalTime) and LocalDate.toDateTime(LocalTime, DateTimeZone)
+  These methods used DateTimeUtils.currentTimeMillis() in all cases, rather than just when LocalTime was null
+  Behaviour when LocalTiem is null has been left unchanged
+  When LocalTime is non-null, it no longer uses DateTimeUtils.currentTimeMillis()
+  This change resulted in the semantic change detailed above
+
+
+Scala
+--------
+Joda-Time uses annotations from Joda-Convert.
+In the Java programming language, this dependency is optional, however in Scala it is not.
+Scala users must manually add the Joda-Convert v1.2 dependency.
+</source>
+</p>
+</section>
+
+</body>
+</document>