diff --git a/djrill/_version.py b/djrill/_version.py
index 91f181c..0a535b0 100644
--- a/djrill/_version.py
+++ b/djrill/_version.py
@@ -1,4 +1,4 @@
-VERSION = (1, 5, 0, 'dev')  # Remove the 'dev' component in release branches
+VERSION = (2, 0, 0, 'dev')  # Remove the 'dev' component in release branches
 __version__ = '.'.join([str(x) for x in VERSION[:3]])  # major.minor.patch
 if len(VERSION) > 3:  # x.y.z-pre.release (note the hyphen)
     __version__ += '-' + '.'.join([str(x) for x in VERSION[3:]])
diff --git a/docs/history.rst b/docs/history.rst
index c730a03..7d72a31 100644
--- a/docs/history.rst
+++ b/docs/history.rst
@@ -7,12 +7,13 @@ Among other things, this means that minor updates
 and breaking changes will always increment the
 major version number (1.x to 2.0).
 
-Upcoming Changes in Djrill 2.0
-------------------------------
 
-Djrill 2.0 is under development and will include some breaking changes.
-Although the changes won't impact most Djrill users, the current
-version of Djrill (1.4) will try to warn you if you use things
+Djrill 2.0 (in development)
+---------------------------
+
+Djrill 2.0 is under development and includes some breaking changes.
+Although the changes won't impact most Djrill users, the previous
+version of Djrill (1.4) tries to warn you if you use things
 that will change. (Warnings appear in the console when running Django
 in debug mode.)
 
@@ -66,8 +67,8 @@ with :exc:`djrill.MandrillAPIError`.   Djrill 1.4 will report a
 DeprecationWarning if you are still importing DjrillBackendHTTPError.
 
 
-Change Log
-----------
+Older Releases
+--------------
 
 Version 1.4: