diff --git a/docs/source/releases.rst b/docs/source/releases.rst
index 124096d4..c7b22755 100644
--- a/docs/source/releases.rst
+++ b/docs/source/releases.rst
@@ -2,6 +2,8 @@
 Release Notes
 =============
 
+.. include:: whatsnew/0.8.4.txt
+
 .. include:: whatsnew/0.8.3.txt
 
 .. include:: whatsnew/0.8.0.txt
diff --git a/docs/source/whatsnew/0.8.4.txt b/docs/source/whatsnew/0.8.4.txt
index ae6a72bc..24af1d0e 100644
--- a/docs/source/whatsnew/0.8.4.txt
+++ b/docs/source/whatsnew/0.8.4.txt
@@ -1,9 +1,13 @@
-Release 0.8.4
--------------
+Development
+-----------
 
 :Release: 0.8.4
 :Date: TBD
 
+.. warning::
+   This release is still under active development.  All changes listed are
+   subject to change at any time.
+
 Highlights
 ~~~~~~~~~~