diff --git a/.travis.yml b/.travis.yml
index e6127e5bf..28b8a5d8d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,6 +9,8 @@ matrix:
       env: TOXENV=py36
     - python: '3.7'
       env: TOXENV=py37
+    - python: '3.8'
+      env: TOXENV=py38
     - python: 'pypy3'
       env: TOXENV=pypy3
     - env: TOXENV=flake8
diff --git a/docs/change_log/release-3.2.md b/docs/change_log/release-3.2.md
index 375831e2f..5a22fcdfe 100644
--- a/docs/change_log/release-3.2.md
+++ b/docs/change_log/release-3.2.md
@@ -2,7 +2,7 @@ title: Release Notes for v3.2
 
 # Python-Markdown 3.2 Release Notes
 
-Python-Markdown version 3.2 supports Python versions 3.5, 3.6, 3.7,
+Python-Markdown version 3.2 supports Python versions 3.5, 3.6, 3.7, 3.8,
 PyPy and PyPy3.
 
 ## Backwards-incompatible changes
@@ -56,6 +56,8 @@ The following new features have been included in the release:
 * Markdown parsing in HTML has been exposed via a separate extension called
   [`md_in_html`](../extensions/md_in_html.md).
 
+* Add support for Python 3.8.
+
 ## Bug fixes
 
 The following bug fixes are included in the 3.2 release:
diff --git a/setup.py b/setup.py
index 1c74567b1..a3934ec21 100755
--- a/setup.py
+++ b/setup.py
@@ -130,6 +130,7 @@ def get_version():
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
+        'Programming Language :: Python :: 3.8',
         'Programming Language :: Python :: 3 :: Only',
         'Programming Language :: Python :: Implementation :: CPython',
         'Programming Language :: Python :: Implementation :: PyPy',
diff --git a/tox.ini b/tox.ini
index 793bd676e..14dcc2137 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py35, py36, py37, pypy3, flake8, checkspelling, pep517check
+envlist = py35, py36, py37, py38, pypy3, flake8, checkspelling, pep517check
 isolated_build = True
 min_verison = 1.9