3 files changed, 3 insertions, 2 deletions

diff --git a/CHANGES.rst b/CHANGES.rst
index 1e5c437..1f40674 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -7,7 +7,7 @@ CHANGES
 
 - Better error message on PO-File Syntax Errors. [SyZn]
 
-- Add support for Python 3.5.
+- Add support for Python 3.5 and 3.6.
 
 - Drop support for Python 2.6, 3.2 and 3.3.
 
diff --git a/setup.py b/setup.py
index 9a4147b..8b205bd 100644
--- a/setup.py
+++ b/setup.py
@@ -65,6 +65,7 @@ setup(
         'Programming Language :: Python :: 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',
         'Natural Language :: English',
diff --git a/tox.ini b/tox.ini
index 01154f2..2b40de1 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py27,py34,py35,pypy,pypy3,coverage,docs
+envlist = py27,py34,py35,py36,pypy,pypy3,coverage,docs
 
 [testenv]
 commands =