diff --git a/.github/workflows/pythonpackage.yml b/.github/workflows/pythonpackage.yml
index a4f765220..5e94cd05e 100644
--- a/.github/workflows/pythonpackage.yml
+++ b/.github/workflows/pythonpackage.yml
@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [3.5, 3.6, 3.7, 3.8]
+        python-version: [3.5, 3.6, 3.7, 3.8, 3.9]
 
     steps:
     - uses: actions/checkout@v2
diff --git a/doc/source/changes.rst b/doc/source/changes.rst
index 86cc5f373..cfb7f1fad 100644
--- a/doc/source/changes.rst
+++ b/doc/source/changes.rst
@@ -7,6 +7,7 @@ Changelog
 
 * git.Commit objects now have a ``replace`` method that will return a
   copy of the commit with modified attributes.
+* Add python 3.9 support
 
 3.1.13
 ======
diff --git a/setup.py b/setup.py
index ef9dd33dd..500e88c8c 100755
--- a/setup.py
+++ b/setup.py
@@ -126,6 +126,7 @@ def build_py_modules(basedir, excludes=[]):
         "Programming Language :: Python :: 3.5",
         "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: 3.7",
-        "Programming Language :: Python :: 3.8"
+        "Programming Language :: Python :: 3.8",
+         "Programming Language :: Python :: 3.9"
     ]
 )
diff --git a/tox.ini b/tox.ini
index 532c78dec..4167cb637 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py34,py35,py36,py37,py38,flake8
+envlist = py34,py35,py36,py37,py38,py39,flake8
 
 [testenv]
 commands = python -m unittest --buffer {posargs}