diff --git a/CHANGES.rst b/CHANGES.rst
index 7639f4cf..11dba5be 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,6 +1,16 @@
 Changes
 =======
 
+1.21.0
+------
+
+Postgres 17 is now officially supported.
+
+Fixed a bug with joins, when a ``ForeignKey`` column had ``db_column_name``
+specified. Thanks to @jessemcl-flwls for reporting this issue.
+
+-------------------------------------------------------------------------------
+
 1.20.0
 ------
 
diff --git a/piccolo/__init__.py b/piccolo/__init__.py
index e1974bd8..fa25b57e 100644
--- a/piccolo/__init__.py
+++ b/piccolo/__init__.py
@@ -1 +1 @@
-__VERSION__ = "1.20.0"
+__VERSION__ = "1.21.0"