diff --git a/module-client/src/main/java/org/apache/http/client/HttpClient.java b/module-client/src/main/java/org/apache/http/client/HttpClient.java
index 31a5ad4f4..628518f5c 100644
--- a/module-client/src/main/java/org/apache/http/client/HttpClient.java
+++ b/module-client/src/main/java/org/apache/http/client/HttpClient.java
@@ -33,8 +33,6 @@
 
 import java.io.IOException;
 
-import org.apache.http.HttpHost;
-import org.apache.http.HttpRequest;
 import org.apache.http.HttpResponse;
 import org.apache.http.HttpException;
 import org.apache.http.params.HttpParams;
@@ -42,8 +40,6 @@
 import org.apache.http.client.methods.HttpUriRequest;
 import org.apache.http.conn.ClientConnectionManager;
 
-
-
 /**
  * Interface for an HTTP client.
  * HTTP clients encapsulate a smorgasbord of objects required to
diff --git a/module-client/src/main/java/org/apache/http/impl/client/DefaultClientRequestDirector.java b/module-client/src/main/java/org/apache/http/impl/client/DefaultClientRequestDirector.java
index c293d4152..074d8db6a 100644
--- a/module-client/src/main/java/org/apache/http/impl/client/DefaultClientRequestDirector.java
+++ b/module-client/src/main/java/org/apache/http/impl/client/DefaultClientRequestDirector.java
@@ -537,6 +537,7 @@ protected boolean createTunnel(HttpRoute route, HttpContext context)
         throws HttpException, IOException {
 
         HttpHost proxy = route.getProxyHost();
+        HttpHost target = route.getTargetHost();
         HttpResponse response = null;
         
         boolean done = false;
@@ -554,6 +555,7 @@ protected boolean createTunnel(HttpRoute route, HttpContext context)
             if (agent != null) {
                 connect.addHeader(HTTP.USER_AGENT, agent);
             }
+            connect.addHeader(HTTP.TARGET_HOST, target.toHostString());
             
             AuthScheme authScheme = this.proxyAuthState.getAuthScheme();
             AuthScope authScope = this.proxyAuthState.getAuthScope();