diff --git a/CHANGELOG.md b/CHANGELOG.md
index ce7494e70..c86030717 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Changelog
 
+## 3.1.6
+
+* Ignore `Not a directory` error for optional config paths
+* Fix upload of whole address book/calendar with UIDs that collide on
+  case-insensitive filesystem
+* Remove runtime dependency on setuptools for Python>=3.9
+* Windows: Block ADS paths
+
 ## 3.1.5
 
 * Ignore configuration file if access is denied
diff --git a/setup.py b/setup.py
index a967f57aa..a3a435a4c 100644
--- a/setup.py
+++ b/setup.py
@@ -43,7 +43,7 @@
 
 # When the version is updated, a new section in the CHANGELOG.md file must be
 # added too.
-VERSION = "3.1.5"
+VERSION = "3.1.6"
 WEB_FILES = ["web/internal_data/css/icon.png",
              "web/internal_data/css/main.css",
              "web/internal_data/fn.js",