diff --git a/.travis.yml b/.travis.yml
index 7e88de4..1590d9a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,12 +4,14 @@ python:
   - '2.7'
   - '3.4'
   - '3.5'
+  - '3.6'
 env:
   global:
     - DB=postgres
   matrix:
-    - DJANGO=">=1.8,<1.9"
     - DJANGO=">=1.9,<1.10"
+    - DJANGO=">=1.10,<1.11"
+    - DJANGO=">=1.11,<2.0"
 install:
   - pip install -q coverage flake8 Django$DJANGO django-nose>=1.4
   - python setup.py install
diff --git a/db_mutex/version.py b/db_mutex/version.py
index abeeedb..2b8877c 100644
--- a/db_mutex/version.py
+++ b/db_mutex/version.py
@@ -1 +1 @@
-__version__ = '0.4.0'
+__version__ = '0.5.0'
diff --git a/docs/release_notes.rst b/docs/release_notes.rst
index e1ff053..9b0722f 100644
--- a/docs/release_notes.rst
+++ b/docs/release_notes.rst
@@ -1,9 +1,17 @@
 Release Notes
 =============
 
+v0.5.0
+------
+* Add python 3.6 support
+* Drop Django 1.8 support
+* Add Django 1.10 support
+* Add Django 1.11 support
+
 v0.4.0
 ------
-* Add python 3.5 support, drop django 1.7 support
+* Add python 3.5 support
+* Drop Django 1.7 support
 
 v0.3.1
 ------
diff --git a/setup.py b/setup.py
index 8f9221a..fa406a3 100644
--- a/setup.py
+++ b/setup.py
@@ -33,24 +33,26 @@ def get_version():
         'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.6',
         'Intended Audience :: Developers',
         'License :: OSI Approved :: MIT License',
         'Operating System :: OS Independent',
         'Framework :: Django',
-        'Framework :: Django :: 1.8',
         'Framework :: Django :: 1.9',
+        'Framework :: Django :: 1.10',
+        'Framework :: Django :: 1.11',
     ],
     license='MIT',
     install_requires=[
         'django>=1.8',
     ],
     tests_require=[
-        'psycopg2>=2.4.5',
+        'psycopg2',
         'django-nose>=1.4',
-        'mock>=1.0.1',
+        'mock',
         'coverage>=3.7.1',
         'freezegun>=0.3.2',
-        'django-dynamic-fixture>=1.8.1'
+        'django-dynamic-fixture'
     ],
     test_suite='run_tests.run_tests',
     include_package_data=True,