diff --git a/ChangeLog b/ChangeLog
index 323ef30..01766a8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,8 @@
 	crash when using dynamic discovery. Patch by Fabian Mauchle.
 	- Closing and freeing TLS clients properly. Patch by Fabian
 	Mauchle.
+	- Timing out on TLS clients not closing the connection properly.
+	Patch by Fabian Mauchle.
 
 2012-10-25 1.6.2
 	Bug fixes (security):
diff --git a/tls.c b/tls.c
index dc70977..90c3dc9 100644
--- a/tls.c
+++ b/tls.c
@@ -355,7 +355,7 @@ void tlsserverrd(struct client *client) {
     }
 
     for (;;) {
-	buf = radtlsget(client->ssl, 0);
+	buf = radtlsget(client->ssl, IDLE_TIMEOUT * 3);
 	if (!buf) {
 	    debug(DBG_ERR, "tlsserverrd: connection from %s lost", addr2string(client->addr));
 	    break;