diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6934aee51..0cb429b1e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,8 @@
 IMPROVEMENTS:
  * driver/docker: Allow setting container IP with user defined networks
    [GH-2535]
+ * client: Fingerprint all routable addresses on an interface including IPv6
+   addresses [GH-2536]
 
 BUG FIXES:
  * server: Reject non-TLS clients when TLS enabled [GH-2525]
diff --git a/website/source/docs/agent/configuration/client.html.md b/website/source/docs/agent/configuration/client.html.md
index 38cf28317..9bcf9c021 100644
--- a/website/source/docs/agent/configuration/client.html.md
+++ b/website/source/docs/agent/configuration/client.html.md
@@ -51,7 +51,9 @@ client {
 
 - `network_interface` `(string: "lo | lo0")` - Specifies the name of the
   interface to force network fingerprinting on. This defaults to the loopback
-  interface.
+  interface. All addresses on the interface are fingerprinted except the ones
+  which are scoped local for IPv6. On a dual stack system the scheduler is going
+  to pick one of the many addresses which have been fingerprinted.
 
 - `network_speed` `(int: 0)` - Specifies an override for the network link speed.
   This value, if set, overrides any detected or defaulted link speed. Most