diff --git a/.travis.yml b/.travis.yml
index 0cd7461..92e7e5b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,6 +19,8 @@
           env: TOXENV=py34
         - python: 3.5
           env: TOXENV=py35
+        - python: 3.6
+          env: TOXENV=py36
         - python: pypy
           env: TOXENV=pypy-nocoverage PYPY_VERSION=2.6.1
         - python: pypy
@@ -60,6 +62,10 @@
         - language: generic
           os: osx
           osx_image: xcode8.1
+          env: TOXENV=py36 CRYPTOGRAPHY_OSX_NO_LINK_FLAGS=1
+        - language: generic
+          os: osx
+          osx_image: xcode8.1
           env: TOXENV=pypy-nocoverage CRYPTOGRAPHY_OSX_NO_LINK_FLAGS=1 PYPY_VERSION=5.4.1
         - language: generic
           os: osx
diff --git a/.travis/install.sh b/.travis/install.sh
index f405ab1..14c29df 100755
--- a/.travis/install.sh
+++ b/.travis/install.sh
@@ -32,6 +32,10 @@
             pyenv install 3.5.2
             pyenv global 3.5.2
             ;;
+        py36)
+            pyenv install 3.6.0
+            pyenv global 3.6.0
+            ;;
         pypy*)
             pyenv install "pypy-$PYPY_VERSION"
             pyenv global "pypy-$PYPY_VERSION"
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index a4bcac3..15f444c 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -6,6 +6,8 @@
 
 .. note:: This version is not yet released and is under active development.
 
+* Added support for Python 3.6.
+
 1.7.1 - 2016-12-13
 ~~~~~~~~~~~~~~~~~~
 
diff --git a/docs/installation.rst b/docs/installation.rst
index 0c489ad..888b8bc 100644
--- a/docs/installation.rst
+++ b/docs/installation.rst
@@ -10,8 +10,8 @@
 Supported platforms
 -------------------
 
-Currently we test ``cryptography`` on Python 2.6, 2.7, 3.3, 3.4, 3.5, and PyPy
-2.6+ on these operating systems.
+Currently we test ``cryptography`` on Python 2.6, 2.7, 3.3, 3.4, 3.5, 3.6, and
+PyPy 2.6+ on these operating systems.
 
 * x86-64 CentOS 7.x, 6.4
 * x86-64 FreeBSD 10
diff --git a/setup.py b/setup.py
index c5a99be..8419e6a 100644
--- a/setup.py
+++ b/setup.py
@@ -297,6 +297,7 @@
         "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",
         "Topic :: Security :: Cryptography",
diff --git a/tox.ini b/tox.ini
index e29b2d5..0e75011 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 minversion = 2.4
-envlist = py26,py27,pypy,py33,py34,py35,docs,pep8,py3pep8
+envlist = py26,py27,pypy,py33,py34,py35,py36,docs,pep8,py3pep8
 
 [testenv]
 extras =