diff --git a/.travis.yml b/.travis.yml
index b957ad25..58088a5a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,11 +10,14 @@ env:
   - TOXENV=django18
   - TOXENV=django19
   - TOXENV=django110
+  - TOXENV=django111
 
 matrix:
  include:
-  - python: 3.5
+  - python: 3.6
     env: TOXENV=quality,docs
+    python: 3.6
+    env: TOXENV=django111
 
 cache:
   - pip
@@ -37,5 +40,5 @@ deploy:
   distributions: sdist bdist_wheel
   on:
     tags: true
-    python: 3.5
-    condition: '$TOXENV = django110'
+    python: 3.6
+    condition: '$TOXENV = django111'
diff --git a/docs/index.rst b/docs/index.rst
index 49315421..d27a3605 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -9,8 +9,8 @@ for developing on the edX platform.
 Requirements
 ------------
 
-* Python (2.7, 3.5)
-* Django (1.8, 1.9)
+* Python (2.7, 3.5, 3.6)
+* Django (1.8, 1.9, 1.10, 1.11)
 * Django REST Framework (3.2+)
 
 Installation
diff --git a/edx_rest_framework_extensions/__init__.py b/edx_rest_framework_extensions/__init__.py
index 15b60fbc..a24191b6 100644
--- a/edx_rest_framework_extensions/__init__.py
+++ b/edx_rest_framework_extensions/__init__.py
@@ -1,3 +1,3 @@
 """ edx Django REST Framework extensions. """
 
-__version__ = '1.2.2'  # pragma: no cover
+__version__ = '1.2.3'  # pragma: no cover
diff --git a/setup.py b/setup.py
index 160e7748..a6b5a1a7 100755
--- a/setup.py
+++ b/setup.py
@@ -22,14 +22,16 @@
         'Programming Language :: Python',
         'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.6',
         'Framework :: Django',
         'Framework :: Django :: 1.8',
         'Framework :: Django :: 1.9',
         'Framework :: Django :: 1.10',
+        'Framework :: Django :: 1.11',
     ],
     packages=['edx_rest_framework_extensions'],
     install_requires=[
-        'django>=1.8.9,<1.11',
+        'django>=1.8.9,<2.0',
         'djangorestframework>=3.2.3,<4.0.0',
         'djangorestframework-jwt>=1.7.2,<2.0.0',
         'python-dateutil>=2.0',
diff --git a/tox.ini b/tox.ini
index b8a79079..50b2b16d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py{27,35}-django{18,19,110}, quality, docs
+envlist = py{27,35}-django{18,19,110,111}, py36-django111, quality, docs
 
 [testenv]
 setenv =
@@ -10,6 +10,7 @@ deps =
     django18: Django>=1.8,<1.9
     django19: Django>=1.9,<1.10
     django110: Django>=1.10,<1.11
+    django111: Django>=1.11,<2.0
     -rtest_requirements.txt
 
 commands =