diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5997241bfb..442f47d00c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,6 +18,7 @@ BUG FIXES:
 * agent: Parse values given to `?passing` for health endpoints. Previously Consul only checked for the existence of the querystring, not the value. That means using `?passing=false` would actually still include passing values. Consul 0.9 now parses the value given to passing as a boolean. If no value is provided, the old behavior remains. **This may be a breaking change for some users**, but the old experience was incorrect and caused enough confusion to warrant changing it. [GH-2212, GH-3136]
 * agent: Fixed a regression where configuring -1 for the port was no longer disabling the DNS server. [GH-3135]
 * agent: Fix `consul leave` shutdown race. When shutting down an agent via the `consul leave` command on the command line the output would be `EOF` instead of `Graceful leave completed` [GH-2880]
+* agent: Show a better error message than 'EOF' when attempting to join with the wrong gossip key. [GH-1013]
 * server: Fixed an issue where the leader could return stale data duing queries as it is starting up. [GH-2644]
 
 ## 0.8.4 (June 9, 2017)