diff --git a/.travis.yml b/.travis.yml
index e593ad8..e00674f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -40,6 +40,7 @@ language: python
 python:
   - "2.7"
   - "3.5"
+  - "3.6"
 
 cache:
   - pip
@@ -83,7 +84,7 @@ jobs:
       after_success:
         - coveralls
     - stage: deploy-pypi
-      python: "3.5"
+      python: "3.6"
       env: REQUIREMENTS=release EXTRAS=all,sqlite SQLALCHEMY_DATABASE_URI="sqlite:///test.db"
       before_install: echo "Skipping before_install step..."
       install: echo "Skipping install step..."
@@ -98,7 +99,7 @@ jobs:
             tags: true
             if: tag =~ ^v
     - stage: deploy-docs
-      python: "3.5"
+      python: "3.6"
       env: REQUIREMENTS=release EXTRAS=all,sqlite SQLALCHEMY_DATABASE_URI="sqlite:///test.db"
       script: sphinx-build -qnNW docs/source docs/build/html
       before_deploy:
diff --git a/CHANGES.md b/CHANGES.md
index f170de8..3ff96f9 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,7 @@
+Version 0.1.4.post
+
+- Add Python 3.6 to Travis CI test matrix [49](https://github.com/tobiasfrust/shibboleth-authenticator/pull/49)
+
 Version 0.1.4
 
 - No new changes are introduced in this version. PyPi deployment failed for version 0.1.3.
diff --git a/setup.py b/setup.py
index 6cef4e9..079d942 100644
--- a/setup.py
+++ b/setup.py
@@ -122,6 +122,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',
         'Development Status :: 5 - Production/Stable',
     ]
diff --git a/shibboleth_authenticator/version.py b/shibboleth_authenticator/version.py
index 7ca4219..0fd82e3 100644
--- a/shibboleth_authenticator/version.py
+++ b/shibboleth_authenticator/version.py
@@ -23,4 +23,4 @@
 """
 
 
-__version__ = '0.1.4'
+__version__ = '0.1.4.post'