diff --git a/CHANGES b/CHANGES
index a4352161cf..30ac873d7b 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+3626.	[func]		dig: NSID output now easier to read. [RT #21160]
+
 3625.	[bug]		Don't send notify messages to machines outside of the
 			test setup.
 
diff --git a/lib/dns/message.c b/lib/dns/message.c
index aa8d901445..505a093e1c 100644
--- a/lib/dns/message.c
+++ b/lib/dns/message.c
@@ -3270,16 +3270,17 @@ dns_message_pseudosectiontotext(dns_message_t *msg,
 					sprintf(buf, "%02x ", optdata[i]);
 					ADD_STRING(target, buf);
 				}
+
+				ADD_STRING(target, "(\"");
 				for (i = 0; i < optlen; i++) {
-					ADD_STRING(target, " (");
 					if (isprint(optdata[i]))
 						isc_buffer_putmem(target,
 								  &optdata[i],
 								  1);
 					else
 						isc_buffer_putstr(target, ".");
-					ADD_STRING(target, ")");
 				}
+				ADD_STRING(target, "\")");
 				isc_buffer_forward(&optbuf, optlen);
 			}
 			ADD_STRING(target, "\n");