diff --git a/.travis.yml b/.travis.yml
index 6ccc2a5..400f4ae 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,16 +5,20 @@ matrix:
     env: TOXENV=py26
   - python: 2.7
     env: TOXENV=py27
-  - python: 3.3
-    env: TOXENV=py33
   - python: 3.4
     env: TOXENV=py34
   - python: 3.5
     env: TOXENV=py35
-  - python: nightly
+  - python: 3.6
     env: TOXENV=py36
+  - python: nightly
+    env: TOXENV=py37
   - python: pypy
     env: TOXENV=pypy
+# Travis CI hasn't updated to PyPy3 5.5+ yet, so still has the exception
+# chaining compatibility bug that breaks the contextlib2 tests
+#  - python: pypy3
+#    env: TOXENV=pypy3
 install: pip install tox coveralls && tox --notest
 script: tox
 after_success: coveralls
diff --git a/NEWS.rst b/NEWS.rst
index d3f68b1..20a7217 100644
--- a/NEWS.rst
+++ b/NEWS.rst
@@ -1,6 +1,17 @@
 Release History
 ---------------
 
+0.5.5 (2017-04-25)
+^^^^^^^^^^^^^^^^^^
+
+* Issue `#13 <https://github.com/jazzband/contextlib2/issues/13>`__:
+  ``setup.py`` now falls back to plain ``distutils`` if ``setuptools`` is not
+  available (patch by Allan Harwood)
+
+* Updates to the default compatibility testing matrix:
+  * Added: PyPy3, CPython 3.6 (maintenance), CPython 3.7 (development)
+  * Dropped: CPython 3.3
+
 0.5.4 (2016-07-31)
 ^^^^^^^^^^^^^^^^^^
 
diff --git a/README.rst b/README.rst
index 64c4087..a90264c 100644
--- a/README.rst
+++ b/README.rst
@@ -26,7 +26,8 @@ Development
 -----------
 
 contextlib2 has no runtime dependencies, but requires ``unittest2`` for testing
-on Python 2.x.
+on Python 2.x, as well as ``setuptools`` and ``wheel`` to generate universal
+wheel archives.
 
 Local testing is just a matter of running ``python test_contextlib2.py``.
 
@@ -42,15 +43,14 @@ Versions currently tested in both tox and Travis CI are:
 * CPython 2.7
 * CPython 3.4
 * CPython 3.5
-* CPython 3.6 (CPython development branch)
+* CPython 3.6
+* CPython 3.7 (CPython development branch)
 * PyPy
 
-tox also has a PyPy3 configuration, but it is not configured in Travis
-due to a
-`known incompatibility <https://bitbucket.org/pypy/pypy/issues/1903>`_.
+Versions currently tested only in tox are:
 
-To install several of the relevant runtimes on Fedora 23::
+* PyPy3
 
-    sudo dnf install python python3 pypy pypy3
-    sudo dnf copr enable -y mstuchli/Python3.5
-    sudo dnf install python35-python3
+This is due to an exception chaining compatibility bug that was fixed in
+the PyPy3 5.5 alpha release, while the version on Travis CI (as of April 2017)
+is still the older PyPy3 2.4.0 release.
diff --git a/VERSION.txt b/VERSION.txt
index 7d85683..d1d899f 100644
--- a/VERSION.txt
+++ b/VERSION.txt
@@ -1 +1 @@
-0.5.4
+0.5.5
diff --git a/tox.ini b/tox.ini
index 0b1bf07..3ef47b9 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py{26,27,33,34,35,36,py,py3}
+envlist = py{26,27,34,35,36,37,py,py3}
 skip_missing_interpreters = True
 
 [testenv]
@@ -12,7 +12,3 @@ deps =
     py26: unittest2
     py27: unittest2
     pypy: unittest2
-
-[testenv:pypy3]
-# Known incompatibility: https://bitbucket.org/pypy/pypy/issues/1903
-ignore_outcome = True