diff --git a/CHANGELOG.md b/CHANGELOG.md
index 03184e17..4a5dc869 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,16 @@
 Changelog
 =========
 
+Version 3.6.0 (2021-12-21)
+--------------------------
+* Support for Django 4.0. Thanks @domdinicola!
+* `cleanup_mail` now deletes emails in batches, which is much nicer to DB when deleting millions of emails. Thanks @stevemc4!
+* Failure to send an email are now logged as an exception. Thanks @SaturnFromTitan!
+* Added `es` locale. Thanks @ahmontero!
+* Fixed admin template discovery issue for case-sensitive filesystems. Thanks @fasih!
+* Fixes: `SMTPServerDisconnected` error. Thanks @weimens!
+* Various maintenance work by @jrief and @mogost.
+
 Version 3.5.3 (2020-12-04)
 --------------------------
 * Fixed an issue with Celery integration that could cause duplicate emails. Thanks @jrief!
diff --git a/README.md b/README.md
index 23ff4f24..b9cae92f 100644
--- a/README.md
+++ b/README.md
@@ -19,9 +19,6 @@ Django. Some awesome features are:
 
 -   [django \>= 2.2](https://djangoproject.com/)
 -   [jsonfield](https://github.com/rpkilby/jsonfield)
-
-### Optional Dependency
-
 -   [bleach](https://bleach.readthedocs.io/)
 
 With this optional dependency, HTML emails are nicely rendered
diff --git a/post_office/version.txt b/post_office/version.txt
index c1c916f2..02f277fd 100644
--- a/post_office/version.txt
+++ b/post_office/version.txt
@@ -1 +1 @@
-3, 5, 3
\ No newline at end of file
+3, 6, 0
\ No newline at end of file