diff --git a/.travis.yml b/.travis.yml
index 4a69d3e..6f23de2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,20 +13,18 @@ matrix:
     env: TOX_ENV=py27-django19
   - python: "2.7"
     env: TOX_ENV=py27-django110
+  - python: "2.7"
+    env: TOX_ENV=py27-django111
   - python: "3.4"
     env: TOX_ENV=py34-django17
   - python: "3.4"
     env: TOX_ENV=py34-django18
-  - python: "3.4"
-    env: TOX_ENV=py34-django19
-  - python: "3.4"
-    env: TOX_ENV=py34-django110
-  - python: "3.5"
-    env: TOX_ENV=py35-django18
-  - python: "3.5"
-    env: TOX_ENV=py35-django19
   - python: "3.5"
     env: TOX_ENV=py35-django110
+  - python: "3.5"
+    env: TOX_ENV=py35-django111
+  - python: "3.6"
+    env: TOX_ENV=py36-django111
   - python: "2.7"
     env: TOX_ENV=coverage
 cache:
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 9e60767..9cf850b 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -7,6 +7,14 @@ All notable changes to this project will be documented in this file.
    :depth: 2
 
 
+Unreleased
+==========
+
+Added
+-----
+* Support for python 3.6 and Django 1.11
+
+
 v0.9.0 - 2017-11-17
 ===================
 
@@ -28,7 +36,6 @@ Fixed
 * Fix XSS js injection
 
 
-
 v0.8.0 - 2017-03-08
 ===================
 
diff --git a/README.rst b/README.rst
index 8bddb08..0a4031e 100644
--- a/README.rst
+++ b/README.rst
@@ -21,7 +21,7 @@ Features
 * Possibility to rename/rewrite attributes per service
 * Possibility to require some attribute values per service
 * Federated mode between multiple CAS
-* Supports Django 1.7, 1.8 and 1.9
+* Supports Django 1.7, 1.8, 1.9, 1.10 and 1.11
 * Supports Python 2.7, 3.x
 
 Dependencies
diff --git a/setup.py b/setup.py
index 148a11c..7fded3a 100644
--- a/setup.py
+++ b/setup.py
@@ -35,6 +35,7 @@ if __name__ == '__main__':
             'Framework :: Django :: 1.8',
             'Framework :: Django :: 1.9',
             'Framework :: Django :: 1.10',
+            'Framework :: Django :: 1.11',
             'Intended Audience :: Developers',
             'Intended Audience :: System Administrators',
             'License :: OSI Approved :: GNU General Public License v3 (GPLv3)',
@@ -45,6 +46,7 @@ if __name__ == '__main__':
             'Programming Language :: Python :: 3',
             'Programming Language :: Python :: 3.4',
             'Programming Language :: Python :: 3.5',
+            'Programming Language :: Python :: 3.6',
             'Topic :: Software Development :: Libraries :: Python Modules',
             'Topic :: Internet :: WWW/HTTP',
             'Topic :: Internet :: WWW/HTTP :: Dynamic Content',
@@ -59,7 +61,7 @@ if __name__ == '__main__':
         },
         keywords=['django', 'cas', 'cas3', 'server', 'sso', 'single sign-on', 'authentication', 'auth'],
         install_requires=[
-            'Django >= 1.7,<1.11', 'requests >= 2.4', 'requests_futures >= 0.9.5',
+            'Django >= 1.7,<1.12', 'requests >= 2.4', 'requests_futures >= 0.9.5',
             'lxml >= 3.4', 'six >= 1'
         ],
         url="https://github.com/nitmir/django-cas-server",
diff --git a/tox.ini b/tox.ini
index 43e8774..d9161de 100644
--- a/tox.ini
+++ b/tox.ini
@@ -6,13 +6,12 @@ envlist=
     py27-django18,
     py27-django19,
     py27-django110,
+    py27-django111,
     py34-django17,
     py34-django18,
-    py34-django19,
-    py34-django110,
-    py35-django18,
-    py35-django19,
     py35-django110,
+    py35-django111,
+    py36-django111,
 
 [flake8]
 max-line-length=100
@@ -62,6 +61,12 @@ deps =
     Django>=1.10,<1.11
     {[base]deps}
 
+[testenv:py27-django111]
+basepython=python2.7
+deps =
+    Django>=1.11,<1.12
+    {[base]deps}
+
 [testenv:py34-django17]
 basepython=python3.4
 deps =
@@ -74,36 +79,25 @@ deps =
     Django>=1.8,<1.9
     {[base]deps}
 
-[testenv:py34-django19]
-basepython=python3.4
-deps =
-    Django>=1.9,<1.10
-    {[base]deps}
-
-[testenv:py34-django110]
-basepython=python3.4
-deps =
-    Django>=1.10,<1.11
-    {[base]deps}
-
-[testenv:py35-django18]
-basepython=python3.5
-deps =
-    Django>=1.8,<1.9
-    {[base]deps}
-
-[testenv:py35-django19]
-basepython=python3.5
-deps =
-    Django>=1.9,<1.10
-    {[base]deps}
-
 [testenv:py35-django110]
 basepython=python3.5
 deps =
     Django>=1.10,<1.11
     {[base]deps}
 
+[testenv:py35-django111]
+basepython=python3.5
+deps =
+    Django>=1.11,<1.12
+    {[base]deps}
+
+[testenv:py36-django111]
+basepython=python3.6
+deps =
+    Django>=1.11,<1.12
+    {[base]deps}
+
+
 
 [testenv:flake8]
 basepython=python