diff --git a/doc/Changelog b/doc/Changelog
index 66e8da823..ff6067aa3 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,6 @@
+23 December 2010: Wouter
+	- Fix in infra cache that could cause rto larger than TOP_TIMEOUT kept.
+
 21 December 2010: Wouter
 	- algorithm compromise protection using the algorithms signalled in
 	  the DS record.  Also, trust anchors, DLV, and RFC5011 receive this,
diff --git a/services/cache/infra.c b/services/cache/infra.c
index 4e39886e5..cbc603ebf 100644
--- a/services/cache/infra.c
+++ b/services/cache/infra.c
@@ -275,7 +275,8 @@ infra_host(struct infra_cache* infra, struct sockaddr_storage* addr,
 			wr = 1;
 			/* TOP_TIMEOUT remains on reuse */
 			if(old >= USEFUL_SERVER_TOP_TIMEOUT)
-				((struct infra_host_data*)e->data)->rtt.rto=old;
+				((struct infra_host_data*)e->data)->rtt.rto
+					= USEFUL_SERVER_TOP_TIMEOUT;
 		}
 	}
 	if(!e) {