diff --git a/.travis.yml b/.travis.yml
index 437b74e..d2c1f62 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -25,61 +25,65 @@ jobs:
       language: python
       env: PYENV_VERSION=2.6.9 TOXENV=py26
     - <<: *linux
-      env: PYENV_VERSION=2.7.17 TOXENV=py27
+      env: PYENV_VERSION=2.7.18 TOXENV=py27
     - <<: *linux
       env: PYENV_VERSION=2.7-dev TOXENV=py27
     - <<: *linux
       env: PYENV_VERSION=3.4.10 TOXENV=py34
     - <<: *linux
-      env: PYENV_VERSION=3.5.8 TOXENV=py35
+      env: PYENV_VERSION=3.5.10 TOXENV=py35
     - <<: *linux
       env: PYENV_VERSION=3.5-dev TOXENV=py35
     - <<: *linux
-      env: PYENV_VERSION=3.6.9 TOXENV=py36 DEPLOY=1
+      env: PYENV_VERSION=3.6.12 TOXENV=py36 DEPLOY=1
     - <<: *linux
       env: PYENV_VERSION=3.6-dev TOXENV=py36
     - <<: *linux
-      env: PYENV_VERSION=3.7.5 TOXENV=py37
+      env: PYENV_VERSION=3.7.9 TOXENV=py37
     - <<: *linux
       env: PYENV_VERSION=3.7-dev TOXENV=py37
     - <<: *linux
-      env: PYENV_VERSION=3.8.0 TOXENV=py38
+      env: PYENV_VERSION=3.8.6 TOXENV=py38
     - <<: *linux
       env: PYENV_VERSION=3.8-dev TOXENV=py38
+    - <<: *linux
+      env: PYENV_VERSION=3.9.0 TOXENV=py39
     - <<: *linux
       env: PYENV_VERSION=3.9-dev TOXENV=py39
     - <<: *linux
-      env: PYENV_VERSION=pypy2.7-7.2.0 TOXENV=pypy
+      env: PYENV_VERSION=pypy2.7-7.3.1 TOXENV=pypy
     - <<: *linux
-      env: PYENV_VERSION=pypy3.6-7.2.0 TOXENV=pypy3
+      env: PYENV_VERSION=pypy3.6-7.3.1 TOXENV=pypy3
     - &osx
       os: osx
       language: generic
-      env: PYENV_VERSION=2.7.17 TOXENV=py27
+      env: PYENV_VERSION=2.7.18 TOXENV=py27
     - <<: *osx
       env: PYENV_VERSION=2.7-dev TOXENV=py27
     - <<: *osx
-      env: PYENV_VERSION=3.5.8 TOXENV=py35
+      env: PYENV_VERSION=3.5.10 TOXENV=py35
     - <<: *osx
       env: PYENV_VERSION=3.5-dev TOXENV=py35
     - <<: *osx
-      env: PYENV_VERSION=3.6.9 TOXENV=py36
+      env: PYENV_VERSION=3.6.12 TOXENV=py36
     - <<: *osx
       env: PYENV_VERSION=3.6-dev TOXENV=py36
     - <<: *osx
-      env: PYENV_VERSION=3.7.5 TOXENV=py37
+      env: PYENV_VERSION=3.7.9 TOXENV=py37
     - <<: *osx
       env: PYENV_VERSION=3.7-dev TOXENV=py37
     - <<: *osx
-      env: PYENV_VERSION=3.8.0 TOXENV=py38
+      env: PYENV_VERSION=3.8.6 TOXENV=py38
     - <<: *osx
       env: PYENV_VERSION=3.8-dev TOXENV=py38
+    - <<: *osx
+      env: PYENV_VERSION=3.9.0 TOXENV=py39
     - <<: *osx
       env: PYENV_VERSION=3.9-dev TOXENV=py39
     - <<: *osx
-      env: PYENV_VERSION=pypy2.7-7.2.0 TOXENV=pypy
+      env: PYENV_VERSION=pypy2.7-7.3.1 TOXENV=pypy
     - <<: *osx
-      env: PYENV_VERSION=pypy3.6-7.2.0 TOXENV=pypy3
+      env: PYENV_VERSION=pypy3.6-7.3.1 TOXENV=pypy3
   allow_failures:
     - env: PYENV_VERSION=2.7-dev TOXENV=py27
     - env: PYENV_VERSION=3.5-dev TOXENV=py35
@@ -90,12 +94,12 @@ jobs:
 
 before_install:
   - mkdir -p ${HOME}/.cache/pyenv
-  - if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew update && (brew upgrade pyenv || true) && (brew install openssl || true); fi
+  - if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew update && (brew upgrade pyenv || true) && (brew install openssl || true) && (brew install readline || true) && (brew install xz || true); fi
   - if [ "$TRAVIS_OS_NAME" = "linux" ]; then git -C "$(pyenv root)" fetch && git -C "$(pyenv root)" checkout master && git -C "$(pyenv root)" pull; fi
 
 install:
   - python -m pip install -r travis-requirements.txt
-  - pyenv install $(pyenv exec python --version >/dev/null 2>&1 && echo "--skip-existing" || echo "--force")  "${PYENV_VERSION}"
+  - pyenv install $(pyenv exec python --version >/dev/null 2>&1 && echo "--skip-existing" || echo "--force") "${PYENV_VERSION}"
 
 script:
   - python -m tox -vv -- --cov-report=xml
diff --git a/setup.cfg b/setup.cfg
index 410156b..05cf437 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -27,6 +27,7 @@ classifiers =
     Programming Language :: Python :: 3.6
     Programming Language :: Python :: 3.7
     Programming Language :: Python :: 3.8
+    Programming Language :: Python :: 3.9
     Topic :: Software Development :: Version Control
     Topic :: System :: Archiving
 platforms =