diff --git a/distribute-tests-race.patch b/distribute-tests-race.patch
new file mode 100644
index 0000000..d2dd2aa
--- /dev/null
+++ b/distribute-tests-race.patch
@@ -0,0 +1,23 @@
+# HG changeset patch
+# User Toshio Kuratomi <toshio@fedoraproject.org>
+# Date 1276227950 14400
+# Branch 0.6-maintenance
+# Node ID ce279b5609b90c55c365043db02bfaa3b305d1ce
+# Parent  99b0b605bfbd00f0752da34cfa15bb2eddfbf302
+Fix race condition with the http server used in unittests
+
+diff -r 99b0b605bfbd -r ce279b5609b9 setuptools/tests/server.py
+--- a/setuptools/tests/server.py	Thu Jun 10 19:47:48 2010 -0400
++++ b/setuptools/tests/server.py	Thu Jun 10 23:45:50 2010 -0400
+@@ -32,7 +32,10 @@
+     def stop(self):
+         """self.shutdown is not supported on python < 2.6"""
+         self._run = False
+-        urllib2.urlopen('http://127.0.0.1:%s/' % self.server_port)
++        try:
++            urllib2.urlopen('http://127.0.0.1:%s/' % self.server_port, None, 5)
++        except urllib2.URLError:
++            pass
+         self.thread.join()
+ 
+     def base_url(self):
diff --git a/python-setuptools.spec b/python-setuptools.spec
index ddce812..2553c1a 100644
--- a/python-setuptools.spec
+++ b/python-setuptools.spec
@@ -8,7 +8,7 @@
 
 Name:           python-setuptools
 Version:        0.6.13
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Easily build and distribute Python packages
 
 Group:          Applications/System
@@ -18,6 +18,7 @@ Source0:        http://pypi.python.org/packages/source/d/%{srcname}/%{srcname}-%
 Source1:        psfl.txt
 Source2:        zpl.txt
 Patch0:         distribute-0.6.13-tests.patch
+Patch1:         distribute-tests-race.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -56,6 +57,7 @@ execute the software that requires pkg_resources.py.
 %prep
 %setup -q -n %{srcname}-%{version}
 %patch0 -p1
+%patch1 -p1
 
 find -name '*.txt' | xargs chmod -x
 
@@ -131,6 +133,9 @@ rm -rf %{buildroot}
 %endif # with_python3
 
 %changelog
+* Thu Jun 10 2010 Toshio Kuratomi <toshio@fedoraproject.org> - 0.6.13-4
+- Fix race condition in unittests under the python-2.6.x on F-14.
+
 * Thu Jun 10 2010 Toshio Kuratomi <toshio@fedoraproject.org> - 0.6.13-3
 - Fix few more buildroot macros