diff --git a/.travis.yml b/.travis.yml
index 9433e71d..3cf62b6e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,48 +1,48 @@
 language: python
 sudo: false
 cache: pip
 
 
 python:
   - 2.7
   - 3.4
   - 3.5
   - 3.6
-  - 3.6-dev
+  - 3.7
   - pypy3.5
 
 env:
   - PYTHONHASHSEED=random
     TEST_REQUIRE="gevent greenlet geventhttpclient fastimport"
 
 matrix:
   include:
     - python: pypy
       env: TEST_REQUIRE=fastimport
     - python: 3.7
       env: TEST_REQUIRE=fastimport
       dist: xenial
       sudo: true
     # flakes checker fails on python 3.8-dev:
     #- python: 3.8-dev
     #  env: TEST_REQUIRE=fastimport
     #  dist: xenial
     #  sudo: true
 
 install:
   - travis_retry pip install -U pip coverage codecov flake8 $TEST_REQUIRE
 
 script:
   # Test without c extensions
   - python -m coverage run -p -m unittest dulwich.tests.test_suite
 
   # Test with c extensions
   - python setup.py build_ext -i
   - python -m coverage run -p -m unittest dulwich.tests.test_suite
 
   # Style
   - make style
 
 after_success:
   - python -m coverage combine
   - codecov
diff --git a/README.rst b/README.rst
index f2c3b05e..81be1361 100644
--- a/README.rst
+++ b/README.rst
@@ -1,96 +1,97 @@
 .. image:: https://travis-ci.org/dulwich/dulwich.png?branch=master
   :alt: Build Status
   :target: https://travis-ci.org/dulwich/dulwich
 
 .. image:: https://ci.appveyor.com/api/projects/status/mob7g4vnrfvvoweb?svg=true
   :alt: Windows Build Status
   :target: https://ci.appveyor.com/project/jelmer/dulwich/branch/master
 
 This is the Dulwich project.
 
 It aims to provide an interface to git repos (both local and remote) that
 doesn't call out to git directly but instead uses pure Python.
 
 **Main website**: <https://www.dulwich.io/>
 
 **License**: Apache License, version 2 or GNU General Public License, version 2 or later.
 
 The project is named after the part of London that Mr. and Mrs. Git live in
 in the particular Monty Python sketch.
 
 Installation
 ------------
 
 By default, Dulwich' setup.py will attempt to build and install the optional C
 extensions. The reason for this is that they significantly improve the performance
 since some low-level operations that are executed often are much slower in CPython.
 
 If you don't want to install the C bindings, specify the --pure argument to setup.py::
 
     $ python setup.py --pure install
 
 or if you are installing from pip::
 
     $ pip install dulwich --global-option="--pure"
 
 Note that you can also specify --global-option in a
 `requirements.txt <https://pip.pypa.io/en/stable/reference/pip_install/#requirement-specifiers>`_
 file, e.g. like this::
 
     dulwich --global-option=--pure
 
 Getting started
 ---------------
 
 Dulwich comes with both a lower-level API and higher-level plumbing ("porcelain").
 
 For example, to use the lower level API to access the commit message of the
 last commit::
 
     >>> from dulwich.repo import Repo
     >>> r = Repo('.')
     >>> r.head()
     '57fbe010446356833a6ad1600059d80b1e731e15'
     >>> c = r[r.head()]
     >>> c
     <Commit 015fc1267258458901a94d228e39f0a378370466>
     >>> c.message
     'Add note about encoding.\n'
 
 And to print it using porcelain::
 
     >>> from dulwich import porcelain
     >>> porcelain.log('.', max_entries=1)
     --------------------------------------------------
     commit: 57fbe010446356833a6ad1600059d80b1e731e15
     Author: Jelmer Vernooij <jelmer@jelmer.uk>
     Date:   Sat Apr 29 2017 23:57:34 +0000
 
     Add note about encoding.
 
 Further documentation
 ---------------------
 
 The dulwich documentation can be found in docs/ and built by running ``make
 doc``. It can also be found `on the web <https://www.dulwich.io/docs/>`_.
 
 Help
 ----
 
 There is a *#dulwich* IRC channel on the `Freenode <https://www.freenode.net/>`_, and
 `dulwich-announce <https://groups.google.com/forum/#!forum/dulwich-announce>`_
 and `dulwich-discuss <https://groups.google.com/forum/#!forum/dulwich-discuss>`_
 mailing lists.
 
 Contributing
 ------------
 
 For a full list of contributors, see the git logs or `AUTHORS <AUTHORS>`_.
 
 If you'd like to contribute to Dulwich, see the `CONTRIBUTING <CONTRIBUTING.rst>`_
 file and `list of open issues <https://github.com/dulwich/dulwich/issues>`_.
 
 Supported versions of Python
 ----------------------------
 
-At the moment, Dulwich supports (and is tested on) CPython 2.7, 3.4, 3.5, 3.6 and Pypy.
+At the moment, Dulwich supports (and is tested on) CPython 2.7, 3.4, 3.5, 3.6,
+3.7 and Pypy.