diff --git a/AUTHORS b/AUTHORS
index 405fb91656..c625049ba0 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -38,6 +38,7 @@ Brian Curtin (brian.curtin@rackspace.com)
 Julien Danjou (julien@danjou.info)
 Ksenia Demina (kdemina@mirantis.com)
 Dan Dillinger (dan.dillinger@sonian.net)
+Morgan Fainberg (m@metacloud.com)
 ZhiQiang Fan (aji.zqfan@gmail.com)
 Flaper Fesp (flaper87@gmail.com)
 Tom Fifield (tom@openstack.org)
@@ -64,15 +65,19 @@ Motonobu Ichimura (motonobu@gmail.com)
 Shri Javadekar (shrinand@maginatics.com)
 Iryoung Jeong (iryoung@gmail.com)
 Paul Jimenez (pj@place.org)
+Zhang Jinnan (ben.os@99cloud.net)
 Jason Johnson (jajohnson@softlayer.com)
 Brian K. Jones (bkjones@gmail.com)
+Kiyoung Jung (kiyoung.jung@kt.com)
 Morita Kazutaka (morita.kazutaka@gmail.com)
 Josh Kearney (josh@jk0.org)
 Ilya Kharin (ikharin@mirantis.com)
 Dae S. Kim (dae@velatum.com)
 Eugene Kirpichov (ekirpichov@gmail.com)
 Leah Klearman (lklrmn@gmail.com)
+Steve Kowalik (steven@wedontsleep.org)
 Sergey Kraynev (skraynev@mirantis.com)
+Sushil Kumar (sushil.kumar2@globallogic.com)
 Steven Lang (Steven.Lang@hgst.com)
 Gonéri Le Bouder (goneri.lebouder@enovance.com)
 Ed Leafe (ed.leafe@rackspace.com)
@@ -112,6 +117,7 @@ Li Riqiang (lrqrun@gmail.com)
 Victor Rodionov (victor.rodionov@nexenta.com)
 Aaron Rosen (arosen@nicira.com)
 Brent Roskos (broskos@internap.com)
+Cristian A Sanchez (cristian.a.sanchez@intel.com)
 Christian Schwede (info@cschwede.de)
 Andrew Clay Shafer (acs@parvuscaptus.com)
 Chuck Short (chuck.short@canonical.com)
@@ -121,7 +127,9 @@ Liu Siqi (meizu647@gmail.com)
 Adrian Smith (adrian_f_smith@dell.com)
 Jon Snitow (otherjon@swiftstack.com)
 TheSriram (sriram@klusterkloud.com)
+Jeremy Stanley (fungi@yuggoth.org)
 Tobias Stevenson (tstevenson@vbridges.com)
+Yuriy Taraday (yorik.sar@gmail.com)
 Monty Taylor (mordred@inaugust.com)
 Caleb Tennis (caleb.tennis@gmail.com)
 Rainer Toebbicke (Rainer.Toebbicke@cern.ch)
diff --git a/CHANGELOG b/CHANGELOG
index 8ab1ba898d..137e551a4c 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,68 @@
+swift (1.12.0)
+
+    * Several important pieces of information have been added to /info:
+
+       - Configured constraints are included and allow a client to discover
+         the limits on names and object sizes that the cluster supports.
+
+       - The supported tempurl methods are now included.
+
+       - Static large object constraints are now included.
+
+    * The Last-Modified header value returned will now be the object's
+      timestamp rounded up to the next second. This allows subsequent
+      requests with If-[un]modified-Since to use the Last-Modified
+      value as expected.
+
+    * Non-integer values for if-delete-at headers will now properly
+      report a 400 error instead of a 503.
+
+    * Fix object versioning with non-ASCII container names.
+
+    * Bulk delete with POST now works properly.
+
+    * Generic means for persisting system metadata
+
+      Swift now supports system-level metadata on accounts and
+      containers. System metadata provides a means to store internal
+      custom metadata with associated Swift resources in a safe and
+      secure fashion without actually having to plumb custom metadata
+      through the core swift servers. The new gatekeeper middleware
+      prevents this system metadata from leaking into the request or
+      being set by a client.
+
+    * catch_errors and gatekeeper middleware are now forced into the proxy
+      pipeline if not explicitly referenced.
+
+    * New container sync configuration option, separating the end user
+      from knowing the required end point and adding more secure
+      signed requests. See
+      http://swift.openstack.org/overview_container_sync.html for full
+      information.
+
+    * bulk middleware now can be configured to retry deleting containers.
+
+    * The default yield_frequency used to keep client connections alive
+      during slow bulk requests was reduced from 60 seconds to 10 seconds.
+      While this is a change to a default, it should not affect deployments
+      and there is no migration process needed.
+
+    * Swift processes will attempt to set RLIMIT_NPROC to 8192.
+
+    * Server processes will now exit with a non-zero error code on config
+      errors.
+
+    * Warn if read_affinity is configured but not enabled.
+
+    * Fix checkmount error parsing in swift-recon.
+
+    * Log at warn level when an object is quarantined.
+
+    * Fixed CVE-2014-0006 to avoid a potential timing attack with tempurl.
+
+    * Various other minor bug fixes and improvements.
+
+
 swift (1.11.0)
 
     * Added discoverable capabilities