diff --git a/NEWS b/NEWS
index 85c0f724..66edee83 100644
--- a/NEWS
+++ b/NEWS
@@ -17,6 +17,8 @@ Please send GNU Wget bug reports to <bug-wget@gnu.org>.
 ** Introduce --no-config.
 
 ** Introduce --start-pos to allow starting downloads from a specified position.
+
+** Fix a problem with ISA Server Proxy and keep-alive connections.
 
 * Changes in Wget 1.15
 
diff --git a/src/ChangeLog b/src/ChangeLog
index 189a503c..051927e4 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2014-06-16  Giuseppe Scrivano  <gscrivan@redhat.com>
+
+	* http.c (gethttp): Set "Connection: Keep-Alive" with keep-alive
+	connections when using a proxy too.
+	Reported by: Thorsten Schroeteler <Thorsten.Schroeteler@cassidian.com>.
+
 2014-06-16  Darshit Shah  <darnir@gmail.com>
 
 	* main.c (print_help, print_version): Mark as noreturn.
diff --git a/src/http.c b/src/http.c
index 9e4dfa4c..383e9f30 100644
--- a/src/http.c
+++ b/src/http.c
@@ -1846,13 +1846,9 @@ gethttp (struct url *u, struct http_stat *hs, int *dt, struct url *proxy,
     request_set_header (req, "Connection", "Close", rel_none);
   else
     {
-      if (proxy == NULL)
-        request_set_header (req, "Connection", "Keep-Alive", rel_none);
-      else
-        {
-          request_set_header (req, "Connection", "Close", rel_none);
-          request_set_header (req, "Proxy-Connection", "Keep-Alive", rel_none);
-        }
+      request_set_header (req, "Connection", "Keep-Alive", rel_none);
+      if (proxy)
+        request_set_header (req, "Proxy-Connection", "Keep-Alive", rel_none);
     }
 
   if (opt.method)