diff --git a/fix-type-error.patch b/fix-type-error.patch
deleted file mode 100644
index 4005444..0000000
--- a/fix-type-error.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-changeset:   3811:6b535d850b40
-branch:      fix-type-error-skip-reason
-tag:         tip
-user:        Thomas Bechtold <tbechtold@suse.com>
-date:        Sun Apr 05 08:39:18 2015 +0200
-summary:     Fix TypeError for pytest.skip()
-
-diff -r ef4e6f655dc0 -r 6b535d850b40 setuptools/tests/test_integration.py
---- a/setuptools/tests/test_integration.py	Sun Apr 05 06:35:14 2015 +0000
-+++ b/setuptools/tests/test_integration.py	Sun Apr 05 08:39:18 2015 +0200
-@@ -28,7 +28,7 @@
-     try:
-         urlopen('https://pypi.python.org/pypi')
-     except Exception as exc:
--        pytest.skip(reason=str(exc))
-+        pytest.skip(str(exc))
- 
- 
- @pytest.fixture
-
diff --git a/python-setuptools.changes b/python-setuptools.changes
index 9caa129..8e24068 100644
--- a/python-setuptools.changes
+++ b/python-setuptools.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Wed Apr 22 09:45:17 UTC 2015 - tbechtold@suse.com
+
+- update to 15.1:
+  * Updated Packaging to 15.1 to address Packaging #28.
+  * Fix ``setuptools.sandbox._execfile()`` with Python 3.1.
+- Remove fix-type-error.patch . Applied upstream
+
 -------------------------------------------------------------------
 Sat Apr 11 08:24:29 UTC 2015 - hpj@urpla.net
 
diff --git a/python-setuptools.spec b/python-setuptools.spec
index 4e60a46..1874999 100644
--- a/python-setuptools.spec
+++ b/python-setuptools.spec
@@ -17,7 +17,7 @@
 
 
 Name:           python-setuptools
-Version:        15.0
+Version:        15.1
 Release:        0
 Url:            http://pypi.python.org/pypi/setuptools
 Summary:        Easily download, build, install, upgrade, and uninstall Python packages
@@ -27,9 +27,6 @@ Source:         https://pypi.python.org/packages/source/s/setuptools/setuptools-
 Source1:        psfl.txt
 Source2:        zpl.txt
 Patch1:         setuptools-5.4.1-create-sitedir.patch
-# NOTE(toabctl): patch submitted upstream
-# See https://bitbucket.org/pypa/setuptools/pull-request/127/fix-typeerror-for-pytestskip/
-Patch2:         fix-type-error.patch
 # NOTE(toabctl): Fix for SLE11SP3 test failures
 Patch3:         fix-sle11-test-failure.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -62,7 +59,6 @@ especially ones that have dependencies on other packages.
 %prep
 %setup -q -n setuptools-%{version}
 %patch1 -p1
-%patch2 -p1
 %if 0%{?suse_version} && 0%{?suse_version} <= 1220
 %patch3 -p1
 %endif
diff --git a/setuptools-15.0.tar.gz b/setuptools-15.0.tar.gz
deleted file mode 100644
index b3a3845..0000000
--- a/setuptools-15.0.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:718d13adf87f99a45835bb20e0a1c4c036de644cd32b3f112639403aa04ebeb5
-size 627831
diff --git a/setuptools-15.1.tar.gz b/setuptools-15.1.tar.gz
new file mode 100644
index 0000000..7ddd01c
--- /dev/null
+++ b/setuptools-15.1.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:cae3aac01a4370bf0f689ae1bfe0520142af749442698e5a20d08ea90a1037ee
+size 627878