diff --git a/ChangeLog b/ChangeLog
index 8fa85e14..be39fd3d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -20,6 +20,7 @@ Changes in current version:
  o Correctly handle DNS replies with no answers set (Fixes bug 1846282)
  o The configure script now takes an --enable-gcc-warnigns option that turns on many optional gcc warnings.  (Nick has been building with these for a while, but they might be useful to other developers.)
  o When building with GCC, use the "format" attribute to verify type correctness of calls to printf-like functions.
+ o removed linger from http server socket; reported by Ilya Martynov
 
 
 Changes in 1.4.0-beta:
diff --git a/http.c b/http.c
index fac2988d..49438083 100644
--- a/http.c
+++ b/http.c
@@ -2371,7 +2371,6 @@ name_from_addr(struct sockaddr *sa, socklen_t salen,
 static int
 bind_socket_ai(struct addrinfo *ai)
 {
-        struct linger linger;
         int fd, on = 1, r;
 	int serrno;
 
@@ -2394,9 +2393,6 @@ bind_socket_ai(struct addrinfo *ai)
 
         setsockopt(fd, SOL_SOCKET, SO_KEEPALIVE, (void *)&on, sizeof(on));
         setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, (void *)&on, sizeof(on));
-        linger.l_onoff = 1;
-        linger.l_linger = 5;
-        setsockopt(fd, SOL_SOCKET, SO_LINGER, (void *)&linger, sizeof(linger));
 
 	r = bind(fd, ai->ai_addr, ai->ai_addrlen);
 	if (r == -1)