diff --git a/CHANGES b/CHANGES
index 38da7a7dae..789ca14885 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+3697.	[bug]		Handle "." as a search list element when IDN support
+			is enabled. [RT #35133]
+
 3696.	[bug]		dig failed to handle AXFR style IXFR responses which
 			span multiple messages. [RT #35137]
 
diff --git a/bin/dig/dighost.c b/bin/dig/dighost.c
index ce2e986fdd..35ead6bfed 100644
--- a/bin/dig/dighost.c
+++ b/bin/dig/dighost.c
@@ -3998,7 +3998,8 @@ append_textname(char *name, const char *origin, size_t namesize) {
 	if (namelen + 1 + originlen >= namesize)
 		return idn_buffer_overflow;
 
-	name[namelen++] = '.';
+	if (*origin != '.')
+		name[namelen++] = '.';
 	(void)strcpy(name + namelen, origin);
 	return idn_success;
 }