diff --git a/CHANGES b/CHANGES
index 6ed80f2f..74f4af8b 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,14 @@
 Waffle Changelog
 ================
 
+v0.18.0
+=======
+- Updated `MIDDLEWARE` setting name for Django 1.10+
+- Improved cache performance for `is_active_for_user`
+- Corrected log formatting
+- Added log entries for admin quick link actions
+- Added permissions for admin actions
+
 v0.17.0
 =======
 - Fixed documentation issues
diff --git a/docs/conf.py b/docs/conf.py
index d19cd773..916911ed 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -48,9 +48,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.17'
+version = '0.18'
 # The full version, including alpha/beta/rc tags.
-release = '0.17.0'
+release = '0.18.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/setup.py b/setup.py
index e779130d..58110809 100644
--- a/setup.py
+++ b/setup.py
@@ -2,7 +2,7 @@
 
 setup(
     name='django-waffle',
-    version='0.17.0',
+    version='0.18.0',
     description='A feature flipper for Django.',
     long_description=open('README.rst').read(),
     author='James Socol',
diff --git a/waffle/__init__.py b/waffle/__init__.py
index 624efd08..f240a7f5 100755
--- a/waffle/__init__.py
+++ b/waffle/__init__.py
@@ -5,7 +5,7 @@
 from waffle.utils import get_setting
 from django.apps import apps as django_apps
 
-VERSION = (0, 17, 0)
+VERSION = (0, 18, 0)
 __version__ = '.'.join(map(str, VERSION))
 default_app_config = 'waffle.apps.WaffleConfig'