diff --git a/doc/FAQ.md b/doc/FAQ.md
index 266331ba4..12c70e52e 100644
--- a/doc/FAQ.md
+++ b/doc/FAQ.md
@@ -72,9 +72,13 @@ Note that if you already have a channel open to them, you'll need to close it be
 There is no risk to your channels if your IP address changes.
 Other nodes might not be able to connect to you, but your node can still connect to them.
 But Core Lightning also has an integrated IPv4/6 address discovery mechanism.
-If your node detects an new public address, it will update its announcement.
+If your node detects an new public address, it can update its announcement.
 For this to work binhind a NAT router you need to forward the default TCP port 9735 to your node.
-IP discovery is only active if no other addresses are announced.
+
+Note: Per default and for privacy reasons IP discovery will only be active
+if no other addresses would be announced (as kind of a fallback).
+You can set `--announce-addr-discovered=true` to explicitly activate it.
+Your node will then update discovered IP addresses even if it also announces e.g. a TOR address.
 
 Alternatively, you can [setup a TOR hidden service](TOR.md) for your node that
 will also work well behind NAT firewalls.
diff --git a/doc/TOR.md b/doc/TOR.md
index 9edb89ec8..d994675b5 100644
--- a/doc/TOR.md
+++ b/doc/TOR.md
@@ -48,9 +48,14 @@ network between you and the Internet, as long as you can use Tor you can
 be connected to.
 
 Note: Core Lightning also support IPv4/6 address discovery behind NAT routers.
-For this to work you need to forward the default TCP port 9735 to your node.
+If your node detects an new public address, it can update its announcement.
+For this to work you need to forward the TCP port 9735 on your NAT router to your node.
 In this case you don't need TOR to punch through your firewall.
-IP discovery is only active if no other addresses are announced.
+
+Note: Per default and for privacy reasons IP discovery will only be active
+if no other addresses would be announced (as kind of a fallback).
+You can set `--announce-addr-discovered=true` to explicitly activate it.
+Your node will then update discovered IP addresses even if it also announces e.g. a TOR address.
 This usually has the benefit of quicker and more stable connections but does not
 offer additional privacy.
 
diff --git a/doc/lightning-listconfigs.7.md b/doc/lightning-listconfigs.7.md
index 5fcd1a941..24f050901 100644
--- a/doc/lightning-listconfigs.7.md
+++ b/doc/lightning-listconfigs.7.md
@@ -89,7 +89,7 @@ On success, an object is returned, containing:
 - **proxy** (string, optional): `proxy` field from config or cmdline, or default
 - **disable-dns** (boolean, optional): `true` if `disable-dns` was set in config or cmdline
 - **disable-ip-discovery** (boolean, optional): `true` if `disable-ip-discovery` was set in config or cmdline (DEPRECATED)
-- **ip-discovery** (string, optional): `true` if `ip-discovery` was set in config or cmdline
+- **announce-addr-discovered** (string, optional): `true`/`false`/`auto` depending on how `announce-addr-discovered` was set in config or cmdline *(added v23.02)*
 - **encrypted-hsm** (boolean, optional): `true` if `encrypted-hsm` was set in config or cmdline
 - **rpc-file-mode** (string, optional): `rpc-file-mode` field from config or cmdline, or default
 - **log-level** (string, optional): `log-level` field from config or cmdline, or default
@@ -221,4 +221,4 @@ RESOURCES
 
 Main web site: <https://github.com/ElementsProject/lightning>
 
-[comment]: # ( SHA256STAMP:bc7c3374ba6609553f431deae62c1e5525e136086b39fffb6c674a58365c0740)
+[comment]: # ( SHA256STAMP:fcf5e537989d9df2cf2031ff6b7589cc1d6acc30a81806e7ecedb3265b8c9b3b)
diff --git a/doc/lightningd-config.5.md b/doc/lightningd-config.5.md
index 116b06313..bb376c86d 100644
--- a/doc/lightningd-config.5.md
+++ b/doc/lightningd-config.5.md
@@ -361,6 +361,13 @@ RPC call lightning-setchannel(7).
 channels. If you want to change the `htlc_maximum_msat` for existing channels,
 use the RPC call lightning-setchannel(7).
 
+* **announce-addr-discovered**=*BOOL*
+
+  Explicitly control the usage of discovered public IPs in `node_announcement` updates.
+  Default: 'auto' - Only if we don't have anything else to announce.
+  Note: You also need to open TCP port 9735 on your router towords your node.
+  Note: Will always be disabled if you use 'always-use-proxy'.
+
 * **disable-ip-discovery**
 
   Turn off public IP discovery to send `node_announcement` updates that contain