diff --git a/ChangeLog b/ChangeLog
index 0dd81c4..d0a890b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,10 @@
+2012-02-10 09:59:41 +0100 Georg Hopp 
+
+	* reset keep_live flag on connection close (HEAD, master)
+
 2012-02-10 09:52:27 +0100 Georg Hopp 
 
-	* made a first cruel handling for keep-alive and non keep-alive requests. @TODO: this MUST BE cleaned (HEAD, master)
+	* made a first cruel handling for keep-alive and non keep-alive requests. @TODO: this MUST BE cleaned
 
 2012-02-10 08:14:31 +0100 Georg Hopp 
 
diff --git a/src/server/close_conn.c b/src/server/close_conn.c
index bb53082..9a8a4ab 100644
--- a/src/server/close_conn.c
+++ b/src/server/close_conn.c
@@ -10,10 +10,14 @@ serverCloseConn(Server this, unsigned int i)
 
 	delete(&((this->conns)[fd].sock));
 	delete(&((this->conns)[fd].reader));
+
 	memset((this->conns)[fd].wbuf, 0, strlen((this->conns)[fd].wbuf));
+	(this->conns)[fd].keep_alive = 0;
+
 	(this->fds)[i].events = 0;
 	(this->fds)[i].revents = 0;
 	(this->fds)[i].fd = 0;
+
 	this->ndel++;
 //	CLEAR_CONN(this, i);
 //	this->nfds--;