diff --git a/docs/installation.rst b/docs/installation.rst
index 2724886bb..f2b27da42 100644
--- a/docs/installation.rst
+++ b/docs/installation.rst
@@ -17,7 +17,7 @@ Notes
 
 .. note:: Pillow >= 2.0.0 < 3.5.0 supports Python versions 2.6, 2.7, 3.2, 3.3, 3.4, 3.5
 
-.. note:: Pillow >= 3.5.0 supports Python versions 2.7, 3.3, 3.4, 3.5
+.. note:: Pillow >= 3.5.0 supports Python versions 2.7, 3.3, 3.4, 3.5, 3.6
 
 Basic Installation
 ------------------
diff --git a/setup.py b/setup.py
index c34b8ed47..c35d4357c 100755
--- a/setup.py
+++ b/setup.py
@@ -763,6 +763,7 @@ try:
               "Programming Language :: Python :: 3.3",
               "Programming Language :: Python :: 3.4",
               "Programming Language :: Python :: 3.5",
+              "Programming Language :: Python :: 3.6",
               'Programming Language :: Python :: Implementation :: CPython',
               'Programming Language :: Python :: Implementation :: PyPy',
           ],