diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst
index c57adc9a..fc2fe7b3 100644
--- a/CONTRIBUTORS.rst
+++ b/CONTRIBUTORS.rst
@@ -29,6 +29,9 @@ In chronological order:
 - Jerome De Cuyper (@jdecuyper)
 
   - Updated documentation and tests.
+  - Added support for user-provided SSLContext objects.
+  - Improved support for HTTP/2 error codes.
+  - Added support for graceful connection closure.
 
 - Fred Thomsen (@fredthomsen)
 
diff --git a/HISTORY.rst b/HISTORY.rst
index 90b8854b..5e11ac28 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -1,16 +1,37 @@
 Release History
 ===============
 
-dev
----
+0.4.0 (2015-06-21)
+------------------
 
 *New Features*
 
-- Support for upgrading plaintext HTTP/1.1 to plaintext HTTP/2. (`Issue 28`_)
+- HTTP/1.1 and HTTP/2 abstraction layer. Don't specify what version you want to
+  use, just automatically get the best version the server supports!
+- Support for upgrading plaintext HTTP/1.1 to plaintext HTTP/2, with thanks to
+  @fredthomsen! (`Issue 28`_)
 - ``HTTP11Connection`` and ``HTTPConnection`` objects are now both context
   managers.
+- Added support for ALPN negotiation when using PyOpenSSL. (`Issue #31`_)
+- Added support for user-provided SSLContext objects, with thanks to
+  @jdecuyper! (`Issue #8`_)
+- Better support for HTTP/2 error codes, with thanks to @jdecuyper!
+  (`Issue #119`_)
+- More gracefully close connections, with thanks to @jdecuyper! (`Issue #15`_)
+
+*Structural Changes*
+
+- The framing and HPACK layers were stripped out into their own libraries.
+
+*Bugfixes*
+
+- Properly verify hostnames when using PyOpenSSL.
 
+.. _Issue #8: https://github.com/Lukasa/hyper/issues/8
+.. _Issue #15: https://github.com/Lukasa/hyper/issues/15
 .. _Issue #28: https://github.com/Lukasa/hyper/issues/28
+.. _Issue #31: https://github.com/Lukasa/hyper/issues/31
+.. _Issue #119: https://github.com/Lukasa/hyper/issues/119
 
 0.3.1 (2015-04-03)
 ------------------
diff --git a/docs/source/conf.py b/docs/source/conf.py
index f37697db..fbe86c0d 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -55,9 +55,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.3.1'
+version = '0.4.0'
 # The full version, including alpha/beta/rc tags.
-release = '0.3.1'
+release = '0.4.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/hyper/__init__.py b/hyper/__init__.py
index 3e59c6d7..379843f8 100644
--- a/hyper/__init__.py
+++ b/hyper/__init__.py
@@ -6,7 +6,7 @@
 A module for providing an abstraction layer over the differences between
 HTTP/1.1 and HTTP/2.
 """
-__version__ = '0.3.1'
+__version__ = '0.4.0'
 
 from .common.connection import HTTPConnection
 from .http20.connection import HTTP20Connection