diff --git a/docs/release.rst b/docs/release.rst
index b01f705..30d159a 100644
--- a/docs/release.rst
+++ b/docs/release.rst
@@ -3,6 +3,7 @@
 - Update the version number and push to pypi
     - Update ``pybind11/_version.py`` (set release version, remove 'dev').
     - Update ``PYBIND11_VERSION_MAJOR`` etc. in ``include/pybind11/common.h``.
+    - Ensure that all the information in ``setup.py`` is up-to-date.
     - Update version in ``docs/conf.py``.
     - Tag release date in ``docs/changelog.rst``.
     - ``git add`` and ``git commit``.
diff --git a/setup.py b/setup.py
index e9bc3c3..5213ee3 100644
--- a/setup.py
+++ b/setup.py
@@ -32,7 +32,7 @@
         'include/pybind11/pytypes.h',
         'include/pybind11/stl.h',
         'include/pybind11/stl_bind.h',
-        'include/pybind11/typeid.h',
+        'include/pybind11/typeid.h'
     ],
     classifiers=[
         'Development Status :: 5 - Production/Stable',
@@ -46,18 +46,19 @@
         'Programming Language :: Python :: 3.3',
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
-        'License :: OSI Approved :: BSD License',
+        'Programming Language :: Python :: 3.6',
+        'License :: OSI Approved :: BSD License'
     ],
     keywords='C++11, Python bindings',
-    long_description="""pybind11 is a lightweight header library that exposes
-C++ types in Python and vice versa, mainly to create Python bindings of
+    long_description="""pybind11 is a lightweight header-only library that
+exposes C++ types in Python and vice versa, mainly to create Python bindings of
 existing C++ code. Its goals and syntax are similar to the excellent
-Boost.Python library by David Abrahams: to minimize boilerplate code in
-traditional extension modules by inferring type information using compile-time
+Boost.Python by David Abrahams: to minimize boilerplate code in traditional
+extension modules by inferring type information using compile-time
 introspection.
 
-The main issue with Boost.Python-and the reason for creating such a similar
-project-is Boost. Boost is an enormously large and complex suite of utility
+The main issue with Boost.Python—and the reason for creating such a similar
+project—is Boost. Boost is an enormously large and complex suite of utility
 libraries that works with almost every C++ compiler in existence. This
 compatibility has its cost: arcane template tricks and workarounds are
 necessary to support the oldest and buggiest of compiler specimens. Now that
@@ -66,9 +67,9 @@
 
 Think of this library as a tiny self-contained version of Boost.Python with
 everything stripped away that isn't relevant for binding generation. Without
-comments, the core header files only require ~2.5K lines of code and depend on
-Python (2.7 or 3.x) and the C++ standard library. This compact implementation
-was possible thanks to some of the new C++11 language features (specifically:
-tuples, lambda functions and variadic templates). Since its creation, this
-library has grown beyond Boost.Python in many ways, leading to dramatically
-simpler binding code in many common situations.""")
+comments, the core header files only require ~4K lines of code and depend on
+Python (2.7 or 3.x, or PyPy2.7 >= 5.7) and the C++ standard library. This
+compact implementation was possible thanks to some of the new C++11 language
+features (specifically: tuples, lambda functions and variadic templates). Since
+its creation, this library has grown beyond Boost.Python in many ways, leading
+to dramatically simpler binding code in many common situations.""")