diff --git a/.mailmap b/.mailmap
index 717b0ec369..f72ff441e1 100644
--- a/.mailmap
+++ b/.mailmap
@@ -81,3 +81,5 @@ Alexandra Settle <alexandra.settle@rackspace.com>
 Kenichiro Matsuda <matsuda_kenichi@jp.fujitsu.com>
 Atsushi Sakai <sakaia@jp.fujitsu.com>
 Takashi Natsume <natsume.takashi@lab.ntt.co.jp>
+Nakagawa Masaaki <nakagawamsa@nttdata.co.jp> nakagawamsa
+Romain Le Disez <romain.ledisez@ovh.net> Romain LE DISEZ
diff --git a/AUTHORS b/AUTHORS
index 29bc166604..7efcfaca64 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -128,6 +128,7 @@ Sushil Kumar (sushil.kumar2@globallogic.com)
 Madhuri Kumari (madhuri.rai07@gmail.com)
 Steven Lang (Steven.Lang@hgst.com)
 Gonéri Le Bouder (goneri.lebouder@enovance.com)
+Romain Le Disez (romain.ledisez@ovh.net)
 John Leach (john@johnleach.co.uk)
 Ed Leafe (ed.leafe@rackspace.com)
 Thomas Leaman (thomas.leaman@hp.com)
@@ -147,6 +148,7 @@ Ben Martin (blmartin@us.ibm.com)
 Steve Martinelli (stevemar@ca.ibm.com)
 Juan J. Martinez (juan@memset.com)
 Marcelo Martins (btorch@gmail.com)
+Nakagawa Masaaki (nakagawamsa@nttdata.co.jp)
 Dolph Mathews (dolph.mathews@gmail.com)
 Kenichiro Matsuda (matsuda_kenichi@jp.fujitsu.com)
 Michael Matur (michael.matur@gmail.com)
@@ -210,6 +212,7 @@ Pradeep Kumar Singh (pradeep.singh@nectechnologies.in)
 Liu Siqi (meizu647@gmail.com)
 Adrian Smith (adrian_f_smith@dell.com)
 Jon Snitow (otherjon@swiftstack.com)
+Emett Speer (speer.emett@gmail.com)
 TheSriram (sriram@klusterkloud.com)
 Jeremy Stanley (fungi@yuggoth.org)
 Mauro Stettler (mauro.stettler@gmail.com)
diff --git a/CHANGELOG b/CHANGELOG
index f4ce9fcf35..0eb08b11a1 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,31 @@
+swift (2.5.0, OpenStack Liberty)
+
+    * Added the ability to specify ranges for Static Large Object (SLO)
+      segments.
+
+    * Replicator configs now support an "rsync_module" value to allow
+      for per-device rsync modules. This setting gives operators the
+      ability to fine-tune replication traffic in a Swift cluster and
+      isolate replication disk IO to a particular device. Please see
+      the docs and sample config files for more information and
+      examples.
+
+    * Significant work has gone in to testing, fixing, and validating
+      Swift's erasure code support at different scales.
+
+    * Swift now emits StatsD metrics on a per-policy basis.
+
+    * Fixed an issue with Keystone integration where a COPY request to a
+      service account may have succeeded even if a service token was not
+      included in the request.
+
+    * Ring validation now warns if a placement partition gets assigned to the
+      same device multiple times. This happens when devices in the ring are
+      unbalanced (e.g. two servers where one server has significantly more
+      available capacity).
+
+    * Various other minor bug fixes and improvements.
+
 swift (2.4.0)
 
     * Dependency changes