diff --git a/SOURCES/restore-proxy-support-SSL-connection.patch b/SOURCES/restore-proxy-support-SSL-connection.patch
index e231b7c..23dc9ef 100644
--- a/SOURCES/restore-proxy-support-SSL-connection.patch
+++ b/SOURCES/restore-proxy-support-SSL-connection.patch
@@ -1,7 +1,7 @@
 diff --git a/setuptools/ssl_support.py b/setuptools/ssl_support.py
 --- a/setuptools/ssl_support.py
 +++ b/setuptools/ssl_support.py
-@@ -235,6 +235,12 @@
+@@ -194,6 +194,12 @@
          sock = create_connection(
              (self.host, self.port), getattr(self,'source_address',None)
          )
@@ -14,3 +14,39 @@ diff --git a/setuptools/ssl_support.py b/setuptools/ssl_support.py
          self.sock = ssl.wrap_socket(
              sock, cert_reqs=ssl.CERT_REQUIRED, ca_certs=self.ca_bundle
          )
+# HG changeset patch
+# User Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com>
+# Date 1404396219 -10800
+# Node ID ca4b86f318ecf4cb46462e65a86fc814295124e8
+# Parent  2381b11608897723145601dac345b9a4c981f3cb
+ssl_support: Adjust to tunneling changes in Python 2.7.7 and 3.4.1.
+
+The fix for https://bugs.python.org/issue7776 changed httplib.HTTPConnection's
+handling of tunneling: `host' now points to the proxy host, so we have to
+adjust the code to perform the certificate validation on `_tunnel_host' instead
+when it is available.
+
+diff --git a/setuptools/ssl_support.py b/setuptools/ssl_support.py
+--- a/setuptools/ssl_support.py
++++ b/setuptools/ssl_support.py
+@@ -178,12 +178,19 @@
+         if hasattr(self, '_tunnel') and getattr(self, '_tunnel_host', None):
+             self.sock = sock
+             self._tunnel()
++            # http://bugs.python.org/issue7776: Python>=3.4.1 and >=2.7.7
++            # change self.host to mean the proxy server host when tunneling is
++            # being used. Adapt, since we are interested in the destination
++            # host for the match_hostname() comparison.
++            actual_host = self._tunnel_host
++        else:
++            actual_host = self.host
+ 
+         self.sock = ssl.wrap_socket(
+             sock, cert_reqs=ssl.CERT_REQUIRED, ca_certs=self.ca_bundle
+         )
+         try:
+-            match_hostname(self.sock.getpeercert(), self.host)
++            match_hostname(self.sock.getpeercert(), actual_host)
+         except CertificateError:
+             self.sock.shutdown(socket.SHUT_RDWR)
+             self.sock.close()
diff --git a/SPECS/python-setuptools.spec b/SPECS/python-setuptools.spec
index 2c1df17..646acbc 100644
--- a/SPECS/python-setuptools.spec
+++ b/SPECS/python-setuptools.spec
@@ -5,7 +5,7 @@
 
 Name:           %{?scl_prefix}python-setuptools
 Version:        0.9.8
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Easily build and distribute Python packages
 
 Group:          Applications/System
@@ -96,6 +96,10 @@ rm -rf %{buildroot}
 %{_bindir}/easy_install-2.*
 
 %changelog
+* Mon May 18 2015 Matej Stuchlik <mstuchli@redhat.com> - 0.9.8-5
+- Enhance patch restoring proxy support in SSL connections
+Resolves: rhbz#1222507
+
 * Thu Apr 10 2014 Matej Stuchlik <mstuchli@redhat.com> - 0.9.8-4
 - Add patch restoring proxy (tunnel) support in SSL connections
 Resolves: rhbz#1085459