diff --git a/CHANGES b/CHANGES
index e4bd7d90e76976b07023392efffeeb8037539a57..e1d6b5687cf965085c138b5de3a48cd25bd52526 100644
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,10 @@
 
                                   Changelog
 
+Daniel (4 July 2006)
+- Toshiyuki Maezawa fixed a problem where you couldn't override the
+  Proxy-Connection: header when using a proxy and not doing CONNECT.
+  
 Daniel (24 June 2006)
 - Michael Wallner added curl_formget(), which allows an application to extract
   (serialise) a previously built formpost (as with curl_formadd()).
diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 9412f0d0e605977cc0a7bc299bccfc4baff3f1e5..fa925c6be37dd50ed088326e5c6d5e47fcc8c42f 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -18,6 +18,7 @@ This release includes the following changes:
 
 This release includes the following bugfixes:
 
+ o couldn't override the Proxy-Connection: header for non-CONNECT requests
  o curl_multi_fdset() could wrongly return -1 as max_fd value
 
 Other curl-related news:
@@ -32,6 +33,6 @@ New curl mirrors:
 This release would not have looked like this without help, code, reports and
 advice from friends like these:
 
- Dan Fandrich, Peter Silva, Arve Knudsen, Michael Wallner
+ Dan Fandrich, Peter Silva, Arve Knudsen, Michael Wallner, Toshiyuki Maezawa
 
         Thanks! (and sorry if I forgot to mention someone)
diff --git a/lib/http.c b/lib/http.c
index b1995e61efe23e164c9de992fc4f481e620e1fe5..ac2a9cf3de811eb3bc3094f11a2f31ad0971544c 100644
--- a/lib/http.c
+++ b/lib/http.c
@@ -1970,7 +1970,9 @@ CURLcode Curl_http(struct connectdata *conn, bool *done)
                 (data->set.encoding && *data->set.encoding && conn->allocptr.accept_encoding)?
                 conn->allocptr.accept_encoding:"",
                 (data->change.referer && conn->allocptr.ref)?conn->allocptr.ref:"" /* Referer: <data> */,
-                (conn->bits.httpproxy && !conn->bits.tunnel_proxy)?
+                (conn->bits.httpproxy &&
+                 !conn->bits.tunnel_proxy &&
+                 !checkheaders(data, "Proxy-Connection:"))?
                   "Proxy-Connection: Keep-Alive\r\n":"",
                 te
                 );