diff --git a/NEWS.adoc b/NEWS.adoc
index 83c12ddfa4..16b1c21b61 100644
--- a/NEWS.adoc
+++ b/NEWS.adoc
@@ -140,6 +140,8 @@ https://github.com/networkupstools/nut/milestone/11
 +
 NOTE: Currently both the long and short names for `libupsclient` should be
 installed.
+   * fixed support for IPv6 addresses (passed in square brackets) for both
+     start/end command-line options and for `-m cidr/mask` option. [#2512]
    * newly added support to scan several IP addresses (single or ranges)
      with the same call, by repeating command-line options; also `-m auto{,4,6}`
      can be specified (once) to select IP (all, IPv4, IPv6) address ranges of
diff --git a/docs/man/nut-scanner.txt b/docs/man/nut-scanner.txt
index f97ce2070f..4186cca4b6 100644
--- a/docs/man/nut-scanner.txt
+++ b/docs/man/nut-scanner.txt
@@ -131,6 +131,8 @@ Requests to scan many single IP addresses will take a while to complete, much
 longer than if they were a single range.  This will be hopefully fixed in later
 releases.
 
+NOTE: Colon-separated IPv6 addresses must be passed in square brackets.
+
 *-t* | *--timeout* 'timeout'::
 Set the network timeout in seconds. Default timeout is 5 seconds.