diff --git a/.travis.yml b/.travis.yml
index 2245af5..6c39c62 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,15 +3,19 @@ python:
   - "2.7"
   - "3.4"
   - "3.5"
+  - "3.6"
 env:
   - DJANGO=1.7
   - DJANGO=1.8
   - DJANGO=1.9
   - DJANGO=1.10
+  - DJANGO=1.11
 matrix:
   exclude:
     - python: "3.5"
       env: DJANGO=1.7
+    - python: "3.6"
+      env: DJANGO=1.7
 install:
   - pip install tox coveralls
 script:
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 57c7499..f572a6d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,10 +4,12 @@ All notable changes to this project will be documented in this file.
 
 ### [Unreleased]
 
+### [0.5.0] - 2017-05-18
+
 ##### Added
 - Signals when user accept/decline the authorization page.
-- `OIDC_AFTER_END_SESSION_HOOK` setting for additional business logic
-- Feature granttype password
+- `OIDC_AFTER_END_SESSION_HOOK` setting for additional business logic.
+- Feature granttype password.
 - require_consent and reuse_consent are added to Client model.
 
 ##### Changed
@@ -16,7 +18,7 @@ All notable changes to this project will be documented in this file.
 ##### Fixed
 - Timestamps with unixtime (instead of django timezone).
 - Field refresh_token cannot be primary key if null.
-- `create_uri_exceptions` are now being logged at `Exception` level not `DEBUG`
+- `create_uri_exceptions` are now being logged at `Exception` level not `DEBUG`.
 
 ### [0.4.4] - 2016-11-29
 
diff --git a/setup.py b/setup.py
index dde8f7e..df451ac 100644
--- a/setup.py
+++ b/setup.py
@@ -10,7 +10,7 @@ os.chdir(os.path.normpath(os.path.join(os.path.abspath(__file__), os.pardir)))
 
 setup(
     name='django-oidc-provider',
-    version='0.4.4',
+    version='0.5.0',
     packages=find_packages(),
     include_package_data=True,
     license='MIT License',
@@ -31,16 +31,17 @@ setup(
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.6',
         'Topic :: Internet :: WWW/HTTP',
         'Topic :: Internet :: WWW/HTTP :: Dynamic Content',
     ],
     test_suite='runtests.runtests',
     tests_require=[
-        'pyjwkest==1.3.0',
-        'mock==2.0.0',
+        'pyjwkest>=1.3.0',
+        'mock>=2.0.0',
     ],
 
     install_requires=[
-        'pyjwkest==1.3.0',
+        'pyjwkest>=1.3.0',
     ],
 )
diff --git a/tox.ini b/tox.ini
index 849f411..ef539ff 100644
--- a/tox.ini
+++ b/tox.ini
@@ -2,9 +2,10 @@
 
 envlist=
     clean,
-    py27-django{17,18,19,110},
-    py34-django{17,18,19,110},
-    py35-django{18,19,110},
+    py27-django{17,18,19,110,111},
+    py34-django{17,18,19,110,111},
+    py35-django{18,19,110,111},
+    py36-django{18,19,110,111},
 
 [testenv]
 
@@ -13,6 +14,7 @@ deps =
     django18: django>=1.8,<1.9
     django19: django>=1.9,<1.10
     django110: django>=1.10,<1.11
+    django111: django>=1.11,<1.12
     coverage
     mock