diff --git a/.travis.yml b/.travis.yml
index c984f2b..dc20d87 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,13 +9,14 @@ python:
   - 3.6
   - 3.7
   - 3.8
+  - 3.9
 jobs:
   include:
-    - python: 3.8
+    - python: 3.9
       env: TOXENV=docs
-    - python: 3.8
+    - python: 3.9
       env: TOXENV=lint
-    - python: 3.8
+    - python: 3.9
       env: TOXENV=formatting
 notifications:
   slack:
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index eaaa906..805fc8d 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -19,12 +19,13 @@ Features
   via the ``sphinx.ext.autodoc.typehints`` extension.
 * `#191 <https://github.com/readthedocs/sphinx-autoapi/issues/191>`:
   Basic incremental build support is enabled ``autoapi_keep_files`` is enabled.
-	Providing none of the source files have changed,
-	AutoAPI will skip parsing the source code and regenerating the API documentation.
+  Providing none of the source files have changed,
+  AutoAPI will skip parsing the source code and regenerating the API documentation.
 * `#200 <https://github.com/readthedocs/sphinx-autoapi/issues/200>`:
   Can pass a callback that edits the Jinja Environment object before
   template rendering begins.
   This allows custom filters, tests, and globals to be added to the environment.
+* Added support for Python 3.9.
 
 Bug Fixes
 ^^^^^^^^^
diff --git a/setup.py b/setup.py
index b93321d..fa795fc 100644
--- a/setup.py
+++ b/setup.py
@@ -42,5 +42,6 @@ setup(
         "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
+        "Programming Language :: Python :: 3.9",
     ],
 )
diff --git a/tox.ini b/tox.ini
index 96962b0..97001c3 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 envlist =
-    py{36,37,38}-sphinx{30,31,32}
+    py{36,37,38,39}-sphinx{30,31,32}
     formatting
     lint
     docs
@@ -10,6 +10,7 @@ python =
     3.6: py36
     3.7: py37
     3.8: py38
+    3.9: py39
 
 [testenv]
 setenv =