diff --git a/.travis.yml b/.travis.yml
index 5663a90..fd212aa 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,5 +6,6 @@ python:
  - "3.3"
  - "3.4"
  - "3.5"
+ - "3.6"
 install: pip install tox-travis flake8
 script: tox
diff --git a/README.md b/README.md
index 8d42576..fc30943 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@ arbitrary swappable models in your own reusable apps.
 
 [![Travis Build Status](https://img.shields.io/travis/wq/django-swappable-models.svg)](https://travis-ci.org/wq/django-swappable-models)
 [![Python Support](https://img.shields.io/pypi/pyversions/swapper.svg)](https://pypi.python.org/pypi/swapper)
-[![Django Support](https://img.shields.io/badge/Django-1.6%2C%201.7%2C%201.8%2C%201.9%2C%201.10-blue.svg)](https://pypi.python.org/pypi/swapper)
+[![Django Support](https://img.shields.io/badge/Django-1.6%2C%201.7%2C%201.8%2C%201.9%2C%201.10%2C%201.11-blue.svg)](https://pypi.python.org/pypi/swapper)
 
 ## Motivation
 
diff --git a/setup.py b/setup.py
index 58b81c2..e4d53b8 100644
--- a/setup.py
+++ b/setup.py
@@ -33,7 +33,7 @@ def parse_markdown_readme():
 
 setup(
     name='swapper',
-    version='1.0.0',
+    version='1.1.0-dev',
     author='S. Andrew Sheppard',
     author_email='andrew@wq.io',
     url='https://github.com/wq/django-swappable-models',
@@ -42,7 +42,6 @@ def parse_markdown_readme():
     description=LONG_DESCRIPTION.strip(),
     long_description=parse_markdown_readme(),
     classifiers=[
-        'Framework :: Django',
         'Development Status :: 5 - Production/Stable',
         'Environment :: Web Environment',
         'License :: OSI Approved :: MIT License',
@@ -55,6 +54,14 @@ def parse_markdown_readme():
         'Programming Language :: Python :: 3.3',
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.6',
+        'Framework :: Django',
+        'Framework :: Django :: 1.6',
+        'Framework :: Django :: 1.7',
+        'Framework :: Django :: 1.8',
+        'Framework :: Django :: 1.9',
+        'Framework :: Django :: 1.10',
+        'Framework :: Django :: 1.11',
     ],
     tests_require=['django>=1.6'],
     test_suite='tests',
diff --git a/tox.ini b/tox.ini
index 8e5cdcf..19e5bff 100644
--- a/tox.ini
+++ b/tox.ini
@@ -6,6 +6,7 @@ envlist =
     py{27,33,34,35}-django18-{noswap,swap}
     py{27,34,35}-django19-{noswap,swap}
     py{27,34,35}-django110-{noswap,swap}
+    py{27,34,35,36}-django111-{noswap,swap}
     lint
 
 [tox:travis]
@@ -13,7 +14,8 @@ envlist =
 2.7 = py27
 3.3 = py33
 3.4 = py34
-3.5 = py35, lint
+3.5 = py35
+3.6 = py36, lint
 
 [testenv]
 commands =
@@ -25,6 +27,7 @@ deps =
     django18: django~=1.8.0
     django19: django~=1.9.0
     django110: django~=1.10.0
+    django111: django~=1.11.0
     unittest2: unittest2
 setenv =
     noswap: DJANGO_SETTINGS_MODULE=tests.settings