diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b25b3d61..21c6f692 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -114,7 +114,7 @@ jobs:
     runs-on: ubuntu-20.04
     strategy:
       matrix:
-        python-version: [2.7, 3.6, 3.7, 3.8]
+        python-version: [2.7, 3.6, 3.7, 3.8, 3.9]
 
     steps:
       - name: Checkout
diff --git a/CHANGES.rst b/CHANGES.rst
index 3ac51772..dbe9d368 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,6 +1,12 @@
 Changes
 =======
 
+Version 0.7.2 (UNRELEASED)
+--------------------------
+
+- Adds support for Python 3.9.
+- Fixes minor code warnings.
+
 Version 0.7.1 (2020-11-09)
 --------------------------
 
diff --git a/setup.py b/setup.py
index f48f1dd0..98f91090 100755
--- a/setup.py
+++ b/setup.py
@@ -86,6 +86,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 :: Python",
         "Topic :: Internet :: WWW/HTTP :: Dynamic Content",