diff --git a/AUTHORS b/AUTHORS
index 165e9d07..fe536af0 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,3 +1,4 @@
+Aarni Koskela (akx@iki.fi)
 Alessandro Pilotti (ap@pilotti.it)
 Alex Gaynor (alex.gaynor@gmail.com)
 Alex Schultz (aschultz@redhat.com)
@@ -43,6 +44,8 @@ Fabien Boucher (fabien.boucher@enovance.com)
 Feng Liu (mefengliu23@gmail.com)
 Flavio Percoco (flaper87@gmail.com)
 Florent Flament (florent.flament-ext@cloudwatt.com)
+fuzihao (fuzihao@inspur.com)
+Ghanshyam Mann (gmann@ghanshyammann.com)
 Greg Holt (gholt@rackspace.com)
 Greg Lange (greglange@gmail.com)
 groqez (groqez@yopmail.net)
@@ -54,6 +57,7 @@ Hiroshi Miura (miurahr@nttdata.co.jp)
 howardlee (lihongweibj@inspur.com)
 Hu Bing (hubingsh@cn.ibm.com)
 Ian Cordasco (ian.cordasco@rackspace.com)
+Ivan Kolodyazhny (e0ne@e0ne.info)
 jacky06 (zhang.min@99cloud.net)
 Jaivish Kothari (jaivish.kothari@nectechnologies.in)
 Jakub Krajcovic (jakub.krajcovic@gmail.com)
@@ -63,8 +67,10 @@ Jeremy Stanley (fungi@yuggoth.org)
 Ji-Wei (ji.wei3@zte.com.cn)
 Jian Zhang (jian.zhang@intel.com)
 Jing Liuqing (jing.liuqing@99cloud.net)
+jinyuanliu (liujinyuan@inspur.com)
 Jiří Suchomel (jsuchome@suse.cz)
 Joel Wright (joel.wright@sohonet.com)
+jonasdlindner (jonaslindner55@gmail.com)
 John Dickinson (me@not.mn)
 Jola Mirecka (jola.mirecka@hp.com)
 Josh Gachnang (josh@pcsforeducation.com)
@@ -88,6 +94,7 @@ Mark Washenberger (mark.washenberger@rackspace.com)
 Martin Geisler (martin@geisler.net)
 Matthew Oliver (matt@oliver.net.au)
 Matthieu Huin (mhu@enovance.com)
+Meuh (fabien+swift@bagard.xyz)
 Mike Widman (mwidman@endurancewindpower.com)
 Min Min Ren (rminmin@cn.ibm.com)
 mmcardle (mark.mcardle@sohonet.com)
@@ -101,6 +108,8 @@ Nguyen Hung Phuong (phuongnh@vn.fujitsu.com)
 Nick Craig-Wood (nick@craig-wood.com)
 Ondrej Novy (ondrej.novy@firma.seznam.cz)
 Pallavi (pallavi.s@nectechnologies.in)
+PAPAMICA (mickael@papamica.com)
+Pavel Abalikhin (anpavl@gmail.com)
 Paul Belanger (pabelanger@redhat.com)
 Paulo Ewerton (pauloewerton@lsd.ufcg.edu.br)
 pengyuesheng (pengyuesheng@gohighsec.com)
@@ -119,6 +128,7 @@ SaiKiran (saikiranveeravarapu@gmail.com)
 Sam Morrison (sorrison@gmail.com)
 Samuel Merritt (sam@swiftstack.com)
 Sean Dague (sean@dague.net)
+Sean McGinnis (sean.mcginnis@gmail.com)
 Sébastien Blaisot (sebastien@blaisot.org)
 Sergey Gotliv (sgotliv@redhat.com)
 Sergio Cazzolato (sergio.j.cazzolato@intel.com)
@@ -129,6 +139,8 @@ Shashirekha Gundur (shashirekha.j.gundur@intel.com)
 shu-mutou (shu-mutou@rf.jp.nec.com)
 Stanislav Vitkovskiy (stas.vitkovsky@gmail.com)
 Stanislaw Pitucha (stanislaw.pitucha@hpe.com)
+Stephen Finucane (stephenfin@redhat.com)
+Steve Kowalik (steven@wedontsleep.org)
 Steve Martinelli (stevemar@ca.ibm.com)
 Steven Hardy (shardy@redhat.com)
 Stuart McLaren (stuart.mclaren@hpe.com)
@@ -136,6 +148,8 @@ sunjia (sunjia@inspur.com)
 Sushil Kumar (sushil.kumar2@globallogic.com)
 tanlin (lin.tan@intel.com)
 Taurus Cheung (Taurus.Cheung@harmonicinc.com)
+Takashi Kajinami (tkajinam@redhat.com)
+Takashi Natsume (takanattie@gmail.com)
 TheSriram (sriram@klusterkloud.com)
 Thiago da Silva (thiagodasilva@gmail.com)
 Thomas Goirand (thomas@goirand.fr)
@@ -156,8 +170,10 @@ wangxiyuan (wangxiyuan@huawei.com)
 wangzhenyu (wangzy@fiberhome.com)
 Wu Wenxiang (wu.wenxiang@99cloud.net)
 wu.chunyang (wu.chunyang@99cloud.net)
+wu.shiming (wushiming@yovole.com)
 YangLei (yanglyy@cn.ibm.com)
 yangxurong (yangxurong@huawei.com)
+yangyawei (yangyawei@inspur.com)
 You Yamagata (bi.yamagata@gmail.com)
 Yuan Zhou (yuan.zhou@intel.com)
 Yushiro FURUKAWA (y.furukawa_2@jp.fujitsu.com)
@@ -166,6 +182,7 @@ yuyafei (yu.yafei@zte.com.cn)
 YUZAWA Takahiko (yuzawataka@intellilink.co.jp)
 Zack M. Davis (zdavis@swiftstack.com)
 zhang-jinnan (ben.os@99cloud.net)
+zhangboye (zhangboye@inspur.com)
 zhangyanxian (zhangyanxianmail@163.com)
 zheng yin (yin.zheng@easystack.cn)
 Zhenguo Niu (zhenguo@unitedstack.com)
diff --git a/ChangeLog b/ChangeLog
index cecee2da..802b2ef1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,104 @@
+4.1.0
+-----
+
+* Tempurl times may now include suffixes: 's', 'm', 'h', or 'd' to indicate
+  seconds, minutes, hours, or days respectively. Times with no suffix
+  continue to be interpretted as seconds.
+
+* Rate-limit responses (498, 429) are now retried.
+
+* Added a `--skip-container-put` option when uploading.
+
+
+4.0.1
+-----
+
+* Added a new `--digest` option to `swift tempurl` to select the signature
+  algorithm to use. Default is sha256, which has been supported by default
+  since Swift 2.17.0, though older clusters may require sha1 (the previous
+  default). Use `swift capabilities` to check the `allowed_digests`.
+
+
+4.0.0
+-----
+
+* Drop support for Python 2.
+
+* Added a `--timeout` option. By default, operations wait indefinitely.
+
+* Swiftclient no longer monkey-patches the requests library.
+
+
+3.13.1
+-----
+
+* This is the final release to support Python 2.
+
+* Fix some example code.
+
+
+3.13.0
+-----
+
+* Improve account-listing formatting when containers have billions of objects.
+
+* Include storage policy information in long-formatted account listings.
+
+* Fix aggregation when listings include more than 10,000 items.
+
+* Suppress traceback logging for 404s.
+
+
+3.12.0
+-----
+
+* Various minor bug fixes and improvements.
+
+
+3.11.1
+-----
+
+* Various minor bug fixes and improvements.
+
+
+3.11.0
+-----
+
+* Fixed a file descriptor leak on Python 2 that was introduced in 3.9.0.
+
+* Transaction IDs are now included in more exceptions.
+
+* Fixed a socket leak when using some module-level functions.
+
+* `swift delete --all` now implies `--versions` to delete all old versions
+  of objects as well.
+
+* Now tested under Python 3.9.
+
+
+3.10.1
+-----
+
+* Tolerate some password-based values for `OS_AUTH_TYPE`.
+
+* Added `max_backoff` and `starting_backoff` options in the `SwiftService` API.
+
+
+3.10.0
+-----
+
+* Added support for the new object-versioning API to the `list`, `stat`,
+  `delete`, and `download` subcommands. This optional API was introduced
+  in Swift 2.24.0; for more information on the API, see
+  https://docs.openstack.org/swift/latest/middleware.html#object-versioning-api
+
+* Added support for Keystone v3 application credentials using
+  `--os-auth-type v3applicationcredential`.
+
+* Fixed an issue with capabilities-endpoint discovery when Swift is exposed as
+  a subpath on the server.
+
+
 3.9.0
 -----