diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 5740b68bf..c84ce6c61 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,6 +1,11 @@
 // Release notes
 // -------------
 
+### v1.0.5 (unreleased)
+
+- Add support for Python 3.7, 3.8, and 3.9
+  https://github.com/nexB/scancode.io/issues/54
+
 ### v1.0.4 (2020-11-17)
 
 - Add a to_json output pipe returning ScanCode compatible content
diff --git a/docs/installation.rst b/docs/installation.rst
index ab8683df2..1f5641f35 100644
--- a/docs/installation.rst
+++ b/docs/installation.rst
@@ -7,8 +7,8 @@ Pre-requisite
 -------------
 
  * **Debian-like** distro or **macOS**
- * Latest version of **Python 3.6**: https://www.python.org/downloads/
- * **PostgreSQL** 10 or later: https://www.postgresql.org/ (or https://postgresapp.com/ on macOS)
+ * **Python 3.6 to 3.9**: https://www.python.org/downloads/
+ * **PostgreSQL 10** or later: https://www.postgresql.org/ (or https://postgresapp.com/ on macOS)
  * Recent version of **git**: https://git-scm.com/
 
 Local installation
@@ -22,6 +22,12 @@ install dependencies, and prepare the database::
     make envfile
     make cleandb
 
+.. note::
+    The Python version can be specified using the following command during the
+    ``make dev`` step::
+
+        make dev PYTHON_EXE=python3.8
+
 Tests
 -----
 
diff --git a/setup.py b/setup.py
index c1d7647e1..a6f04acff 100755
--- a/setup.py
+++ b/setup.py
@@ -70,6 +70,9 @@
         "Programming Language :: Python",
         "Programming Language :: Python :: 3 :: Only",
         "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",
         "Topic :: Utilities",
     ],