diff --git a/.travis.yml b/.travis.yml
index bf2ec24..4ad6c1e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,12 +20,16 @@ matrix:
       env: TOXENV=py37
       dist: xenial
       sudo: true
-    - python: '3.8-dev'
+    - python: 3.8
+      env: TOXENV=py38
       dist: xenial
       sudo: true
-      env: TOXENV=py38
+    - python: '3.9-dev'
+      dist: xenial
+      sudo: true
+      env: TOXENV=py39
   allow_failures:
-    - python: 3.8-dev
+    - python: 3.9-dev
 
 before_install:
   - sed -i 's/git@github.com:/https:\/\/github.com\//' .gitmodules
diff --git a/CHANGES.rst b/CHANGES.rst
index 6fec0b8..ab39286 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -6,6 +6,7 @@ CHANGES
 
 - update language models (uchardet)
 - add iso8859-2 test but disabled it
+- support Python 3.8
 
 2.1.4 (2018-09-27)
 ------------------
diff --git a/appveyor.yml b/appveyor.yml
index 1395a0a..d827407 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -5,12 +5,14 @@ environment:
     - PYTHON: "C:\\Python35"
     - PYTHON: "C:\\Python36"
     - PYTHON: "C:\\Python37"
+    - PYTHON: "C:\\Python38"
     - PYTHON: "C:\\Python27-x64"
     - PYTHON: "C:\\Python34-x64"
       DISTUTILS_USE_SDK: "1"
     - PYTHON: "C:\\Python35-x64"
     - PYTHON: "C:\\Python36-x64"
     - PYTHON: "C:\\Python37-x64"
+    - PYTHON: "C:\\Python38-x64"
 
 install:
   - "git submodule update --init --recursive"
diff --git a/dockerfiles/buildwheel.sh b/dockerfiles/buildwheel.sh
index 7a8126c..81c60d5 100755
--- a/dockerfiles/buildwheel.sh
+++ b/dockerfiles/buildwheel.sh
@@ -4,7 +4,7 @@ set -e -x
 ARCH=`uname -p`
 echo "arch=$ARCH"
 
-for V in cp37-cp37m  cp36-cp36m cp35-cp35m cp34-cp34m cp27-cp27m cp27-cp27mu; do
+for V in cp38-cp38m cp37-cp37m cp36-cp36m cp35-cp35m cp34-cp34m cp27-cp27m cp27-cp27mu; do
     PYBIN=/opt/python/$V/bin
     rm -rf build src/cchardet/__pycache__ src/cchardet/*.cpp src/cchardet/*.pyc src/cchardet/*.so src/cchardet.egg-info src/tests/__pycache__ src/tests/*.pyc
     $PYBIN/pip install -r requirements-dev.txt
diff --git a/setup.py b/setup.py
index 04a5b18..b7bee80 100644
--- a/setup.py
+++ b/setup.py
@@ -135,6 +135,7 @@ setup(
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
+        'Programming Language :: Python :: 3.8',
     ],
     keywords=[
         'cython',
diff --git a/tox.ini b/tox.ini
index 50d8b62..6c31a32 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py27, py34, py35, py36, py37, py38
+envlist = py27, py34, py35, py36, py37, py38, py39
 
 [testenv]
 commands =