diff --git a/daemon/remote.c b/daemon/remote.c
index 5cefdd124..a29924cad 100644
--- a/daemon/remote.c
+++ b/daemon/remote.c
@@ -1126,6 +1126,8 @@ infra_del_host(struct lruhash_entry* e, void* arg)
 	struct infra_key* k = (struct infra_key*)e->key;
 	if(sockaddr_cmp(&inf->addr, inf->addrlen, &k->addr, k->addrlen) == 0) {
 		struct infra_data* d = (struct infra_data*)e->data;
+		d->probedelay = 0;
+		rtt_init(&d->rtt);
 		if(d->ttl >= inf->now) {
 			d->ttl = inf->expired;
 			inf->num_keys++;
diff --git a/doc/Changelog b/doc/Changelog
index 5ed38065e..e0c3254c1 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,6 @@
+2 March 2012: Wouter
+	- flush_infra cleans timeouted servers from the cache too.
+
 1 March 2012: Wouter
 	- forward-first option.  Tries without forward if a query fails.
 	  Also stub-first option that is similar.