diff --git a/README.md b/README.md
index 367ffe7..efc0846 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 # django-partial-index
 
 [![Build Status](https://api.travis-ci.org/mattiaslinnap/django-partial-index.svg?branch=master)](https://travis-ci.org/mattiaslinnap/django-partial-index)
-[![PyPI version](https://badge.fury.io/py/django-partial-index.svg)](https://pypi.python.org/pypi/django-partial-index/0.3.0)
+[![PyPI version](https://badge.fury.io/py/django-partial-index.svg)](https://pypi.python.org/pypi/django-partial-index/0.4.0)
 
 Partial (sometimes also called filtered or conditional) index support for Django.
 
@@ -22,7 +22,8 @@ Requirements:
 
 * Django 1.11 or later.
 * PostgreSQL or SQLite database backend. (Partial indexes are not supported on MySQL, and require major hackery on Oracle.)
-* Python 2.7 and 3.4 - 3.6. (All Python versions supported by Django 1.11.)
+* Python 2.7 and 3.4 - 3.6 for Django 1.11.
+* Python 3.4 - 3.6 for Django 2.0.
 
 ## Usage
 
@@ -121,7 +122,10 @@ for either database is planned for a future version.
 
 ## Version History
 
-### 0.3.0 (latest)
+### 0.4.0 (latest)
+* Add support for Django 2.0.
+
+### 0.3.0
 * Add support for separate `where_postgresql=''` and `where_sqlite=''` predicates, when the expression has different syntax on the two
  database backends and you wish to support both.
 
diff --git a/setup.py b/setup.py
index 43306fc..a05397a 100755
--- a/setup.py
+++ b/setup.py
@@ -6,13 +6,13 @@
 setup(
     name='django-partial-index',
     packages=['partial_index'],
-    version='0.3.0',
+    version='0.4.0',
     description='PostgreSQL and SQLite partial indexes for Django models',
     long_description=open('README.md').read(),
     author='Mattias Linnap',
     author_email='mattias@linnap.com',
     url='https://github.com/mattiaslinnap/django-partial-index',
-    download_url='https://github.com/mattiaslinnap/django-partial-index/archive/0.3.0.tar.gz',
+    download_url='https://github.com/mattiaslinnap/django-partial-index/archive/0.4.0.tar.gz',
     license='BSD',
     install_requires=[],
     classifiers=[
@@ -20,6 +20,7 @@
         'Environment :: Web Environment',
         'Framework :: Django',
         'Framework :: Django :: 1.11',
+        'Framework :: Django :: 2.0',
         'Intended Audience :: Developers',
         'License :: OSI Approved :: BSD License',
         'Operating System :: OS Independent',