diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0187df62b2..2676259ad7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,10 @@
-## 0.9.0 (UNRELEASED)
+## 0.8.5 (UNRELEASED)
 
 BREAKING CHANGES:
 
+* 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 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: The default value of [`-disable-host-node-id`](https://www.consul.io/docs/agent/options.html#_disable_host_node_id) has been changed from false to true. This means you need to opt-in to host-based node IDs and by default Consul will generate a random node ID. A high number of users struggled to deploy newer versions of Consul with host-based IDs because of various edge cases of how the host IDs work in Docker, on specially-provisioned machines, etc. so changing this from opt-out to opt-in will ease operations for many Consul users. [GH-3171]
+
 FEATURES:
 
 IMPROVEMENTS:
@@ -15,7 +18,6 @@ IMPROVEMENTS:
 
 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]