diff --git a/doc/src/install.rst b/doc/src/install.rst
index 2fa0c75f7..8c75086b4 100644
--- a/doc/src/install.rst
+++ b/doc/src/install.rst
@@ -132,7 +132,7 @@ The current `!psycopg2` implementation supports:
     NOTE: keep consistent with setup.py and the /features/ page.
 
 - Python version 2.7
-- Python 3 versions from 3.4 to 3.8
+- Python 3 versions from 3.4 to 3.9
 - PostgreSQL server versions from 7.4 to 13
 - PostgreSQL client library version from 9.1
 
diff --git a/setup.py b/setup.py
index f862d37a4..8dbe8ee00 100644
--- a/setup.py
+++ b/setup.py
@@ -66,6 +66,7 @@
 Programming Language :: Python :: 3.6
 Programming Language :: Python :: 3.7
 Programming Language :: Python :: 3.8
+Programming Language :: Python :: 3.9
 Programming Language :: Python :: Implementation :: CPython
 Programming Language :: C
 Programming Language :: SQL