diff --git a/.travis.yml b/.travis.yml
index 48dd899..4c6e77e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,6 +6,7 @@ python:
  - "3.3"
  - "3.4"
  - "3.5"
+ - "3.6"
 install:
  - "echo 'travis' > RELEASE-VERSION"
  - "python setup.py install"
diff --git a/CHANGES.rst b/CHANGES.rst
index ac59743..8543152 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -4,7 +4,7 @@ Tarjan Changelog
 0.2.4 (unreleased)
 ------------------
 
-- Nothing changed yet.
+- Python 3.6 support
 
 
 0.2.3.1 (2015-11-22)
diff --git a/setup.py b/setup.py
index a43469c..da8e191 100644
--- a/setup.py
+++ b/setup.py
@@ -24,5 +24,6 @@
           'Programming Language :: Python :: 3.3',
           'Programming Language :: Python :: 3.4',
           'Programming Language :: Python :: 3.5',
+          'Programming Language :: Python :: 3.6',
           ],
       )