diff --git a/.travis.yml b/.travis.yml
index 4d70199..7269d0f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,6 +2,7 @@ language: python
 python:
   - '2.7'
   - '3.5'
+  - '3.6'
   - 'pypy'
   - 'pypy3'
 cache:
diff --git a/CHANGES.rst b/CHANGES.rst
index 9219ecd..f7eb2e8 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -9,6 +9,9 @@ Changelog
 - Support flake8 git hook.
   [sergio-alonso]
 
+- Support python 3.6.
+  [gforcada]
+
 2.1.3 (2016-11-25)
 ------------------
 
diff --git a/README.rst b/README.rst
index 65c2e63..2444077 100644
--- a/README.rst
+++ b/README.rst
@@ -32,7 +32,7 @@ or ``no-isort-config`` flake8 configuration option it can be disabled.
 
 Requirements
 ------------
-- Python 2.7, 3.5
+- Python 2.7, 3.5, 3.6, pypy or pypy3
 - flake8
 - isort
 
diff --git a/setup.py b/setup.py
index 05b6bd8..9e6d138 100644
--- a/setup.py
+++ b/setup.py
@@ -25,6 +25,7 @@
         'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: Implementation :: CPython',
         'Programming Language :: Python :: Implementation :: PyPy',
         'Topic :: Software Development :: Quality Assurance',