diff --git a/CHANGES b/CHANGES
index 7765a3c402..5954a389e8 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+4992.	[bug]		The wrong address was being logged for trust anchor
+			telemetry queries. [GL #379]
+
 4991.	[bug]		"rndc reconfig" was incorrectly handling zones whose
 			"mirror" setting was changed. [GL #381]
 
@@ -818,8 +821,8 @@
 
 4760.	[func]		Add glue cache statistics counters. [RT #46028]
 
-4759.	[func]		Add logging channel "trust-anchor-telementry" to
-			record trust-anchor-telementry in incoming requests.
+4759.	[func]		Add logging channel "trust-anchor-telemetry" to
+			record trust-anchor-telemetry in incoming requests.
 			Both _ta-XXXX.<anchor>/NULL and EDNS KEY-TAG options
 			are logged.  [RT #46124]
 
@@ -888,10 +891,10 @@
 			tests when running on terminals that support them.
 			[RT #45977]
 
-4744.	[bug]		Suppress trust-anchor-telementry queries if
+4744.	[bug]		Suppress trust-anchor-telemetry queries if
 			validation is disabled. [RT #46131]
 
-4743.	[func]		Exclude trust-anchor-telementry queries from
+4743.	[func]		Exclude trust-anchor-telemetry queries from
 			synth-from-dnssec processing. [RT #46123]
 
 4742.	[func]		Synthesis of responses from DNSSEC-verified records.
diff --git a/lib/dns/include/dns/name.h b/lib/dns/include/dns/name.h
index 74d114e1ef..c4cffb09a8 100644
--- a/lib/dns/include/dns/name.h
+++ b/lib/dns/include/dns/name.h
@@ -1320,7 +1320,7 @@ dns_name_isula(const dns_name_t *owner);
 isc_boolean_t
 dns_name_istat(const dns_name_t *name);
 /*
- * Determine if 'name' is a potential 'trust-anchor-telementry' name.
+ * Determine if 'name' is a potential 'trust-anchor-telemetry' name.
  */
 
 ISC_LANG_ENDDECLS
diff --git a/lib/dns/name.c b/lib/dns/name.c
index 75225f3ee3..bd2973b96f 100644
--- a/lib/dns/name.c
+++ b/lib/dns/name.c
@@ -2687,7 +2687,7 @@ dns_name_istat(const dns_name_t *name) {
 
 	/*
 	 * Is there at least one trust anchor reported and is the
-	 * label length consistent with a trust-anchor-telementry label.
+	 * label length consistent with a trust-anchor-telemetry label.
 	 */
 	if ((len < 8) || (len - 3) % 5 != 0) {
 		return (ISC_FALSE);
diff --git a/lib/dns/tests/name_test.c b/lib/dns/tests/name_test.c
index 42613f89b8..f5104bd68f 100644
--- a/lib/dns/tests/name_test.c
+++ b/lib/dns/tests/name_test.c
@@ -278,7 +278,7 @@ ATF_TC_BODY(compression, tc) {
 
 ATF_TC(istat);
 ATF_TC_HEAD(istat, tc) {
-	atf_tc_set_md_var(tc, "descr", "is trust-anchor-telementry test");
+	atf_tc_set_md_var(tc, "descr", "is trust-anchor-telemetry test");
 }
 ATF_TC_BODY(istat, tc) {
 	dns_fixedname_t fixed;
diff --git a/lib/ns/query.c b/lib/ns/query.c
index 4faeb37d00..e86608ff74 100644
--- a/lib/ns/query.c
+++ b/lib/ns/query.c
@@ -10815,7 +10815,7 @@ log_tat(ns_client_t *client) {
 
 	isc_netaddr_fromsockaddr(&netaddr, &client->peeraddr);
 	dns_name_format(client->query.qname, namebuf, sizeof(namebuf));
-	isc_netaddr_format(&client->destaddr, clientbuf, sizeof(clientbuf));
+	isc_netaddr_format(&netaddr, clientbuf, sizeof(clientbuf));
 	dns_rdataclass_format(client->view->rdclass, classname,
 			      sizeof(classname));