diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3483617917..d59950cbfc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,12 +4,18 @@ FEATURES:
 
 IMPROVEMENTS:
 
+* agent: Added a check which prevents advertising or setting a service to a zero address (0.0.0.0, [::], ::). [GH-2961]
+
 BUG FIXES:
 
 * build: Added a vendor fix to allow compilation on Illumos. [GH-3024]
 
 ## 0.8.2 (May 9, 2017)
 
+BREAKING CHANGES:
+
+* api: HttpClient now defaults to nil in the client config and will be generated if left blank. A NewHttpClient function has been added for creating an HttpClient with a custom Transport or TLS config. [GH-2922]
+
 IMPROVEMENTS:
 
 * agent: Added an error at agent startup time if both `-ui` and `-ui-dir` are configured together. [GH-2576]
@@ -19,7 +25,6 @@ IMPROVEMENTS:
 * agent: Added `verify_incoming_rpc` and `verify_incoming_https` options for more granular control over incoming TLS enforcement. [GH-2974]
 * agent: Use bind address as source for outgoing connections. [GH-2822]
 * api: Added the ACL replication status endpoint to the Go API client library. [GH-2947]
-* api: HttpClient now defaults to nil in the client config and will be generated if left blank. A NewHttpClient function has been added for creating an HttpClient with a custom Transport or TLS config. [GH-2922]
 * cli: Added Raft protocol version to output of `operator raft list-peers` command.[GH-2929]
 * ui: Added optional JSON validation when editing KV entries in the web UI. [GH-2712]
 * ui: Updated ACL guide links and made guides open in a new tab. [GH-3010]