diff --git a/NEWS b/NEWS
index b3e60a89310271e52eebadec0c35721666c5f662..8768e192e400bb7609513f30c3534dd15ece2c81 100644
--- a/NEWS
+++ b/NEWS
@@ -2,10 +2,10 @@ News
 ====
 
 
-Version 2.5.0 rc6
------------------
+Version 2.5.0
+-------------
 
-*(Released Fri, 23 Mar 2012)*
+*(Released Thu, 12 Apr 2012)*
 
 Incompatible/important changes and bugfixes
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -41,6 +41,8 @@ Incompatible/important changes and bugfixes
 - Offline nodes are ignored when failing over an instance.
 - Support for KVM version 1.0, which changed the version reporting format
   from 3 to 2 digits.
+- TCP/IP ports used by DRBD disks are returned to a pool upon instance
+  removal.
 - ``Makefile`` is now compatible with Automake 1.11.2
 - Includes all bugfixes made in the 2.4 series
 
@@ -134,9 +136,19 @@ Misc
 - A short delay when waiting for job changes reduces the number of LUXI
   requests significantly.
 - DRBD metadata volumes are overwritten with zeros during disk creation.
+- Out-of-band commands no longer acquire the cluster lock in exclusive
+  mode.
 - ``devel/upload`` now uses correct permissions for directories.
 
 
+Version 2.5.0 rc6
+-----------------
+
+*(Released Fri, 23 Mar 2012)*
+
+This was the sixth release candidate of the 2.5 series.
+
+
 Version 2.5.0 rc5
 -----------------
 
diff --git a/configure.ac b/configure.ac
index 6623f3b0937c3c5d892a9b35093be96a660daba5..12d5aa094ce9ca5abda5214013271abc7862654d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
 m4_define([gnt_version_major], [2])
 m4_define([gnt_version_minor], [5])
 m4_define([gnt_version_revision], [0])
-m4_define([gnt_version_suffix], [~rc6])
+m4_define([gnt_version_suffix], [])
 m4_define([gnt_version_full],
           m4_format([%d.%d.%d%s],
                     gnt_version_major, gnt_version_minor,