diff --git a/CHANGES b/CHANGES
index fa75e5ecd8..993d4b7241 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+6286.	[bug]		Dig +yaml will now report "no servers could be reached"
+			on TCP connection failure as well as for UDP timeouts.
+			[GL #4396]
+
 	--- 9.18.20 released ---
 
 6280.	[bug]		Fix missing newlines in the output of "rndc nta -dump".
diff --git a/bin/dig/dighost.c b/bin/dig/dighost.c
index 55f7bf2385..7a6b8ab33f 100644
--- a/bin/dig/dighost.c
+++ b/bin/dig/dighost.c
@@ -3654,6 +3654,7 @@ tcp_connected(isc_nmhandle_t *handle, isc_result_t eresult, void *arg) {
 			start_tcp(next);
 			check_if_done();
 		} else {
+			dighost_error("no servers could be reached\n");
 			clear_current_lookup();
 		}