diff --git a/CHANGES b/CHANGES
index 9c49510cf7..38316bc6cc 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]
+
 6285.	[func]		Remove AES-based DNS cookies. [GL #4421]
 
 6284.	[bug]		Fix a catz db update notification callback registration
diff --git a/bin/dig/dighost.c b/bin/dig/dighost.c
index 41d02365e9..f364147e74 100644
--- a/bin/dig/dighost.c
+++ b/bin/dig/dighost.c
@@ -3602,6 +3602,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();
 		}