diff --git a/AUTHORS b/AUTHORS
index 89996d5a40..fe932d3c1f 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -48,6 +48,7 @@ Alex Holden (alex@alexjonasholden.com)
 Alex Pecoraro (alex.pecoraro@emc.com)
 Alex Szarka (szarka@inf.u-szeged.hu)
 Alex Yang (alex890714@gmail.com)
+Alexander Fadeev (fadeevab.com@gmail.com)
 Alexandra Settle (asettle@suse.com)
 Alexandre Lécuyer (alexandre.lecuyer@corp.ovh.com)
 Alfredo Moralejo (amoralej@redhat.com)
diff --git a/CHANGELOG b/CHANGELOG
index 39c8ac7f16..5b45396407 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,35 @@
+swift (2.31.1, OpenStack Antelope)
+
+    * Sharding fixes
+
+      * Shards no longer report stats to the root database when they are in
+        the CREATED state.
+
+      * Sharding metadata is no longer cleared when databases are deleted.
+        This could previously cause deleted shards that still had rows to
+        become stuck and never move them to the correct database.
+
+      * Fixed a performance regression in the handling of misplaced objects.
+
+      * Swift path and on-disk path are now included with all sharder logging.
+
+    * `s3token` no longer mangles request paths that include the Access Key ID.
+
+    * User metadata is now exposed via CORS when encryption is enabled,
+      matching the behavior when encryption is not enabled.
+
+    * Fewer backend requests are now required when account or container
+      information is missing from memcache.
+
+    * Fixed logging of IP and port in the proxy-server; in particular,
+      internal clients now correctly log about the replication IP/port.
+
+    * Fixed a bug in the object replicator that would cause an under-reporting
+      of failures.
+
+    * Various other minor bug fixes.
+
+
 swift (2.31.0)
 
     * S3 API improvements
@@ -93,7 +125,7 @@ swift (2.31.0)
     * Various other minor bug fixes and improvements.
 
 
-swift (2.30.0)
+swift (2.30.0, OpenStack Zed)
 
     * Sharding improvements
 
diff --git a/releasenotes/notes/2_31_1_release-20ccd07e32b91c1f.yaml b/releasenotes/notes/2_31_1_release-20ccd07e32b91c1f.yaml
new file mode 100644
index 0000000000..9461721d06
--- /dev/null
+++ b/releasenotes/notes/2_31_1_release-20ccd07e32b91c1f.yaml
@@ -0,0 +1,37 @@
+---
+fixes:
+  - |
+    Sharding fixes
+
+    * Shards no longer report stats to the root database when they are in
+      the ``CREATED`` state.
+
+    * Sharding metadata is no longer cleared when databases are deleted.
+      This could previously cause deleted shards that still had rows to
+      become stuck and never move them to the correct database.
+
+    * Fixed a performance regression in the handling of misplaced objects.
+
+    * Swift path and on-disk path are now included with all sharder logging.
+
+  - |
+    ``s3token`` no longer mangles request paths that include the Access Key ID.
+
+  - |
+    User metadata is now exposed via CORS when encryption is enabled,
+    matching the behavior when encryption is not enabled.
+
+  - |
+    Fewer backend requests are now required when account or container
+    information is missing from memcache.
+
+  - |
+    Fixed logging of IP and port in the proxy-server; in particular,
+    internal clients now correctly log about the replication IP/port.
+
+  - |
+    Fixed a bug in the object replicator that would cause an under-reporting
+    of failures.
+
+  - |
+    Various other minor bug fixes.