diff --git a/ChangeLog b/ChangeLog
index 2d541b460..f03e25e52 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,27 @@
-Changes in version 0.2.8.4-?? - 2016-06-??
+Changes in version 0.2.8.4-rc - 2016-06-15
+  Tor 0.2.8.4-rc is the first release candidate in the Tor 0.2.8 series.
+  If we find no new bugs or regressions here, the first stable 0.2.8
+  release will be identical to it. It has a few small bugfixes against
+  previous versions.
+
+  o Major bugfixes (user interface):
+    - Correctly give a warning in the cases where a relay is specified
+      by nickname, and one such relay is found, but it is not officially
+      Named. Fixes bug 19203; bugfix on 0.2.3.1-alpha.
+
+  o Minor features (geoip):
+    - Update geoip and geoip6 to the June 7 2016 Maxmind GeoLite2
+      Country database.
+
+  o Minor bugfixes (compilation):
+    - Cause the unit tests to compile correctly on mingw64 versions that
+      lack sscanf. Fixes bug 19213; bugfix on 0.2.7.1-alpha.
+
+  o Minor bugfixes (downloading):
+    - Predict more correctly whether we'll be downloading over HTTP when
+      we determine the maximum length of a URL. This should avoid a
+      "BUG" warning about the Squid HTTP proxy and its URL limits. Fixes
+      bug 19191.
 
 
 Changes in version 0.2.8.3-alpha - 2016-05-26