diff --git a/.travis.yml b/.travis.yml
index 8dddf1f..0ecf3fe 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,8 +6,7 @@ python:
     - 3.5
     - 3.6
     - 3.7
-    - nightly
-sudo: false
+    - 3.8
 install:
     - pip install coveralls
     - python setup.py develop
diff --git a/CHANGELOG b/CHANGELOG
index dee81fb..53b3548 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,6 @@
 v0.6 (unreleased):
 
+- Added support for Python 3.8.
 - Updated Wikicode.matches() to recognize underscores as being equivalent
   to spaces. (#216)
 - Fixed a rare parsing bug involving deeply nested style tags. (#224)
diff --git a/appveyor.yml b/appveyor.yml
index 854f970..20f9e35 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -62,13 +62,21 @@ environment:
       PYTHON_VERSION: "3.7"
       PYTHON_ARCH:    "64"
 
+    - PYTHON:         "C:\\Python38"
+      PYTHON_VERSION: "3.8"
+      PYTHON_ARCH:    "32"
+
+    - PYTHON:         "C:\\Python38-x64"
+      PYTHON_VERSION: "3.8"
+      PYTHON_ARCH:    "64"
+
 install:
   - "%PIP% install --disable-pip-version-check --user --upgrade pip"
   - "%PIP% install wheel twine"
 
 build_script:
   - "%SETUPPY% build"
-  - "%SETUPPY% install --user"
+  - "%SETUPPY% develop --user"
 
 test_script:
   - "%PYEXE% -m unittest discover"
diff --git a/docs/changelog.rst b/docs/changelog.rst
index 216c46e..1ca7411 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -7,6 +7,7 @@ v0.6
 Unreleased
 (`changes <https://github.com/earwig/mwparserfromhell/compare/v0.5.4...develop>`__):
 
+- Added support for Python 3.8.
 - Updated Wikicode.matches() to recognize underscores as being equivalent
   to spaces. (`#216 <https://github.com/earwig/mwparserfromhell/issues/216>`_)
 - Fixed a rare parsing bug involving deeply nested style tags.
diff --git a/setup.py b/setup.py
index 8f84eb5..97abef0 100644
--- a/setup.py
+++ b/setup.py
@@ -105,6 +105,7 @@ setup(
         "Programming Language :: Python :: 3.5",
         "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: 3.7",
+        "Programming Language :: Python :: 3.8",
         "Topic :: Text Processing :: Markup"
     ],
 )