diff --git a/doc/Changelog b/doc/Changelog
index d37a7ac69..7046f9c9f 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,7 @@
+25 May 2018: Wouter
+	- For TCP and TLS connections that don't establish, perform address
+	  update in infra cache, so future selections can exclude them.
+
 24 May 2018: Wouter
 	- Fix that libunbound can do DNS-over-TLS, when configured.
 	- Fix that windows unbound service can use DNS-over-TLS.
diff --git a/services/outside_network.c b/services/outside_network.c
index 54970c174..5700ef8a9 100644
--- a/services/outside_network.c
+++ b/services/outside_network.c
@@ -1812,7 +1812,7 @@ serviced_tcp_callback(struct comm_point* c, void* arg, int error,
 	}
 	if(sq->tcp_upstream || sq->ssl_upstream) {
 	    struct timeval now = *sq->outnet->now_tv;
-	    if(error==NETEVENT_TIMEOUT) {
+	    if(error!=NETEVENT_NOERROR) {
 	        if(!infra_rtt_update(sq->outnet->infra, &sq->addr,
 		    sq->addrlen, sq->zone, sq->zonelen, sq->qtype,
 		    -1, sq->last_rtt, (time_t)now.tv_sec))