diff --git a/.gitignore b/.gitignore
index 6f0b7d7..d0ad4fa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ distribute-0.6.14.tar.gz
 /distribute-0.6.21.tar.gz
 /distribute-0.6.24.tar.gz
 /distribute-0.6.26.tar.gz
+/distribute-0.6.27.tar.gz
diff --git a/distribute-different-exception-message.patch b/distribute-different-exception-message.patch
new file mode 100644
index 0000000..f5c1746
--- /dev/null
+++ b/distribute-different-exception-message.patch
@@ -0,0 +1,13 @@
+Index: distribute-0.6.27/setuptools/tests/test_packageindex.py
+===================================================================
+--- distribute-0.6.27.orig/setuptools/tests/test_packageindex.py
++++ distribute-0.6.27/setuptools/tests/test_packageindex.py
+@@ -70,7 +70,7 @@ class TestPackageIndex(unittest.TestCase
+             index.open_url(url)
+         except distutils.errors.DistutilsError, error:
+             # Python 2.7.3
+-            self.assert_('getaddrinfo failed' in str(error))
++            self.assert_('getaddrinfo failed' in str(error) or 'Name or service not known' in str(error))
+         except httplib.InvalidURL, error:
+             # Python 2.7.2 and earlier
+             self.assert_('nonnumeric port' in str(error))
diff --git a/distribute-timeout-exception.patch b/distribute-timeout-exception.patch
new file mode 100644
index 0000000..70707a5
--- /dev/null
+++ b/distribute-timeout-exception.patch
@@ -0,0 +1,21 @@
+Index: distribute-0.6.27/setuptools/tests/server.py
+===================================================================
+--- distribute-0.6.27.orig/setuptools/tests/server.py
++++ distribute-0.6.27/setuptools/tests/server.py
+@@ -1,6 +1,7 @@
+ """Basic http server for tests to simulate PyPI or custom indexes
+ """
+ import urllib2
++import socket
+ import sys
+ import threading
+ import BaseHTTPServer
+@@ -44,7 +45,7 @@ class IndexServer(HTTPServer):
+                 urllib2.urlopen(url, timeout=5)
+             else:
+                 urllib2.urlopen(url)
+-        except urllib2.URLError:
++        except (urllib2.URLError, socket.timeout):
+             # ignore any errors; all that's important is the request
+             pass
+         self.thread.join()
diff --git a/python-setuptools.spec b/python-setuptools.spec
index a7a96b0..1f73c5a 100644
--- a/python-setuptools.spec
+++ b/python-setuptools.spec
@@ -7,7 +7,7 @@
 %global srcname distribute
 
 Name:           python-setuptools
-Version:        0.6.26
+Version:        0.6.27
 Release:        1%{?dist}
 Summary:        Easily build and distribute Python packages
 
@@ -17,6 +17,9 @@ URL:            http://pypi.python.org/pypi/%{srcname}
 Source0:        http://pypi.python.org/packages/source/d/%{srcname}/%{srcname}-%{version}.tar.gz
 Source1:        psfl.txt
 Source2:        zpl.txt
+Patch0: distribute-different-exception-message.patch
+Patch1: distribute-timeout-exception.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -61,6 +64,9 @@ This package contains the distribute fork of setuptools.
 %prep
 %setup -q -n %{srcname}-%{version}
 
+%patch0 -p1 -b .excmsg
+%patch1 -p1 -b .exctype
+
 find -name '*.txt' | xargs chmod -x
 find . -name '*.orig' -exec rm \{\} \;
 
@@ -141,6 +147,9 @@ rm -rf %{buildroot}
 %endif # with_python3
 
 %changelog
+* Thu Jun  7 2012 Toshio Kuratomi <toshio@fedoraproject.org> - 0.6.27-1
+- Upstream bugfix
+
 * Tue May 15 2012 Toshio Kuratomi <toshio@fedoraproject.org> - 0.6.24-2
 - Upstream bugfix
 
@@ -259,36 +268,3 @@ rm -rf %{buildroot}
 
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.6c9-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
-* Fri Nov 28 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm@gmail.com> - 0.6c9-2
-- Rebuild for Python 2.6
-
-* Sun Nov 23 2008 Konstantin Ryabitsev <icon@fedoraproject.org> - 0.6c9-1
-- Update to 0.6c9
-- Small fixes to URL, summary and description
-
-* Sat Jun 21 2008 Konstantin Ryabitsev <icon@fedoraproject.org> - 0.6c8-1
-- Update to 0.6c8
-- Accept small tweaks from Gareth Armstrong
-
-* Mon Sep 24 2007 Konstantin Ryabitsev <icon@fedoraproject.org> - 0.6c7-2
-- Move pretty much everything back into runtime in order to avoid more
-  brokenness than we're trying to address with these fixes.
-
-* Fri Sep 14 2007 Konstantin Ryabitsev <icon@fedoraproject.org> - 0.6c7-1
-- Upstream 0.6c7
-- Move some things from devel into runtime, in order to not break other
-  projects.
-
-* Sat Aug 18 2007 Konstantin Ryabitsev <icon@fedoraproject.org> - 0.6c6-2
-- Make license tag conform to the new Licensing Guidelines
-- Move everything except pkg_resources.py into a separate -devel package
-  so we avoid bundling python-devel when it's not required (#251645)
-- Do not package tests
-
-* Sun Jun 10 2007 Konstantin Ryabitsev <icon@fedoraproject.org> - 0.6c6-1
-- Upstream 0.6c6
-- Require python-devel (#240707)
-
-* Sun Jan 28 2007 Konstantin Ryabitsev <icon@fedoraproject.org> - 0.6c5-1
-- Upstream 0.6c5 (known bugs, but the promised 0.6c6 is taking too long)
diff --git a/sources b/sources
index adb238e..11b3ea3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-841f4262a70107f85260362f5def8206  distribute-0.6.26.tar.gz
+ecd75ea629fee6d59d26f88c39b2d291  distribute-0.6.27.tar.gz