diff --git a/.mailmap b/.mailmap
index 67b9e0068f..a42e69034f 100644
--- a/.mailmap
+++ b/.mailmap
@@ -68,3 +68,4 @@ Pawel Palucki <pawel.palucki@gmail.com> <pawel.palucki@gmail.com>
 Guang Yee <guang.yee@hp.com> <guang.yee@hp.com>
 Jing Liuqing <jing.liuqing@99cloud.net> <jing.liuqing@99cloud.net>
 Lorcan Browne <lorcan.browne@hp.com> <lorcan.browne@hp.com>
+Eohyung Lee <liquidnuker@gmail.com> <liquid@kt.com>
diff --git a/AUTHORS b/AUTHORS
index 91eb837e16..083178e59f 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -46,6 +46,7 @@ Thiago da Silva (thiago@redhat.com)
 Julien Danjou (julien@danjou.info)
 Ksenia Demina (kdemina@mirantis.com)
 Dan Dillinger (dan.dillinger@sonian.net)
+Cedric Dos Santos (cedric.dos.sant@gmail.com)
 Gerry Drudy (gerry.drudy@hp.com)
 Morgan Fainberg (morgan.fainberg@gmail.com)
 ZhiQiang Fan (aji.zqfan@gmail.com)
@@ -134,6 +135,7 @@ Colin Nicholson (colin.nicholson@iomart.com)
 Zhenguo Niu (zhenguo@unitedstack.com)
 Timothy Okwii (tokwii@cisco.com)
 Matthew Oliver (matt@oliver.net.au)
+Hisashi Osanai (osanai.hisashi@jp.fujitsu.com)
 Eamonn O'Toole (eamonn.otoole@hp.com)
 James Page (james.page@ubuntu.com)
 Prashanth Pai (ppai@redhat.com)
@@ -151,6 +153,7 @@ Rafael Rivero (rafael@cloudscaling.com)
 Victor Rodionov (victor.rodionov@nexenta.com)
 Aaron Rosen (arosen@nicira.com)
 Brent Roskos (broskos@internap.com)
+Shilla Saebi (shilla.saebi@gmail.com)
 Cristian A Sanchez (cristian.a.sanchez@intel.com)
 saranjan (saranjan@cisco.com)
 Christian Schwede (info@cschwede.de)
diff --git a/CHANGELOG b/CHANGELOG
index 6fceca20eb..7e49a33964 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,50 @@
+swift (2.2.1)
+
+    * Swift now rejects object names with Unicode surrogates.
+
+    * Return 403 (instead of 413) on unauthorized upload when over account
+      quota.
+
+    * Fix a rare condition when a rebalance could cause swift-ring-builder
+      to crash. This would only happen on old ring files when "rebalance"
+      was the first command run.
+
+    * Storage node error limits now survive a ring reload.
+
+    * Speed up reading and writing xattrs for object metadata by using larger
+      xattr value sizes. The change is moving from 254 byte values to 64KiB
+      values. There is no migration issue with this.
+
+    * Deleted containers beyond the reclaim age are now properly reclaimed.
+
+    * Full Simplified Chinese translation (zh_CN locale) for errors and logs.
+
+    * Container quota is now properly enforced during cross-account COPY.
+
+    * ssync replication now properly uses the configured replication_ip.
+
+    * Fixed issue were ssync did not replicate custom object headers.
+
+    * swift-drive-audit now has the 'unmount_failed_device' config option
+      (default to True) that controls if the process will unmount failed
+      drives or not.
+
+    * swift-drive-audit will now dump drive error rates to a recon file.
+      The file location is controlled by the 'recon_cache_path' config value
+      and it includes each drive and its associated number of errors.
+
+    * When a filesystem does't support xattr, the object server now returns
+      a 507 Insufficient Storage error to the proxy server.
+
+    * Clean up empty account and container partitions directories if they
+      are empty. This keeps the system healthy and prevents a large number
+      of empty directories from slowing down the replication process.
+
+    * Show the sum of every policy's amount of async pendings in swift-recon.
+
+    * Various other minor bug fixes and improvements.
+
+
 swift (2.2.0)
 
     * Added support for Keystone v3 auth.