diff --git a/CHANGES b/CHANGES
index 03bafd02bf..9cf760c979 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+5021.	[bug]		dig returned a non-zero exit code when it received a
+			reply over TCP after a retry. [GL #487]
+
 5020.	[func]		RNG uses thread-local storage instead of locks, if
 			supported by platform. [GL #496]
 
diff --git a/bin/dig/dighost.c b/bin/dig/dighost.c
index 98e3595bb4..2903bb020c 100644
--- a/bin/dig/dighost.c
+++ b/bin/dig/dighost.c
@@ -3202,6 +3202,7 @@ connect_done(isc_task_t *task, isc_event_t *event) {
 		UNLOCK_LOOKUP;
 		return;
 	}
+	exitcode = 0;
 	if (keep_open) {
 		if (keep != NULL)
 			isc_socket_detach(&keep);