diff --git a/.travis.yml b/.travis.yml
index 57c4b77..8efcbe1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,10 +18,14 @@ matrix:
       env: TOXENV=py36
     - python: 3.7
       env: TOXENV=py37
-    - env: TOXENV=py37
-      python: nightly
+      dist: xenial
+      sudo: true
+    - python: '3.8-dev'
+      dist: xenial
+      sudo: true
+      env: TOXENV=py38
   allow_failures:
-    - python: nightly
+    - python: 3.8-dev
 
 before_install:
   - sed -i 's/git@github.com:/https:\/\/github.com\//' .gitmodules
diff --git a/CHANGES.rst b/CHANGES.rst
index ebc9b4e..0d30c10 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,6 +1,11 @@
 CHANGES
 =======
 
+2.1.x
+-----
+
+- support Python 3.7
+
 2.1.2
 -----
 
diff --git a/dockerfiles/buildwheel.sh b/dockerfiles/buildwheel.sh
index 78ebd91..7a8126c 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 cp36-cp36m cp35-cp35m cp34-cp34m cp27-cp27m cp27-cp27mu; do
+for V in 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 7251d8f..b427eca 100644
--- a/setup.py
+++ b/setup.py
@@ -128,6 +128,7 @@ setup(
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
+        'Programming Language :: Python :: 3.7',
     ],
     keywords=[
         'cython',
diff --git a/tox.ini b/tox.ini
index 536f284..50d8b62 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py27, py34, py35, py36, py37
+envlist = py27, py34, py35, py36, py37, py38
 
 [testenv]
 commands =