diff --git a/.gitignore b/.gitignore
index d0e5913..81071c1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /wheel-0.22.0.tar.gz
+/wheel-0.24.0.tar.gz
diff --git a/python-wheel.spec b/python-wheel.spec
index 2e104ed..75a6f11 100644
--- a/python-wheel.spec
+++ b/python-wheel.spec
@@ -3,8 +3,8 @@
 %global with_python3 1
 
 Name:           python-%{pypi_name}
-Version:        0.22.0
-Release:        4%{?dist}
+Version:        0.24.0
+Release:        1%{?dist}
 Summary:        A built-package format for Python
 
 License:        MIT
@@ -17,9 +17,6 @@ Source0:        https://pypi.python.org/packages/source/w/%{pypi_name}/%{pypi_na
 #  correct testing wheel)
 Source1:        https://bitbucket.org/dholth/wheel/src/099352e/wheel/test/test-1.0-py2.py3-none-win32.whl
 Source2:        https://bitbucket.org/dholth/wheel/raw/099352e/wheel/test/pydist-schema.json
-Patch0:         wheel-0.22-add-test-files-to-manifest.path
-Patch1:         wheel-0.22-legacy-keyring-compatibility.patch
-Patch2:         wheel-0.22-fix-tests-broken-by-keyring-fix.patch
 BuildArch:      noarch
  
 BuildRequires:  python-devel
@@ -60,10 +57,6 @@ This is package contains Python 3 version of the package.
 %prep
 %setup -q -n %{pypi_name}-%{version}
 
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-
 # copy test files in place
 cp %{SOURCE1} %{pypi_name}/test/
 cp %{SOURCE2} %{pypi_name}/test/
@@ -108,36 +101,36 @@ popd
 %check
 # remove setup.cfg that makes pytest require pytest-cov (unnecessary dep)
 rm setup.cfg
-py.test --ignore build
+PYTHONPATH=$(pwd) py.test --ignore build
 # no test for Python 3, no python3-jsonschema yet
 %if 0
 pushd %{py3dir}
 rm setup.cfg
-py.test-%{python3_version} --ignore build
+PYTHONPATH=$(pwd) py.test-%{python3_version} --ignore build
 popd
 %endif # with_python3
 
 
 %files
 %doc LICENSE.txt CHANGES.txt README.txt
-%{_bindir}/egg2wheel
 %{_bindir}/wheel
-%{_bindir}/wininst2wheel
 %{python_sitelib}/%{pypi_name}*
 %exclude %{python_sitelib}/%{pypi_name}/test
 %if 0%{?with_python3}
 
 %files -n python3-%{pypi_name}
 %doc LICENSE.txt CHANGES.txt README.txt
-%{_bindir}/python3-egg2wheel
 %{_bindir}/python3-wheel
-%{_bindir}/python3-wininst2wheel
 %{python3_sitelib}/%{pypi_name}*
 %exclude %{python3_sitelib}/%{pypi_name}/test
 %endif # with_python3
 
 
 %changelog
+* Mon Nov 10 2014 Slavek Kabrda <bkabrda@redhat.com> - 0.24.0-1
+- Update to 0.24.0
+- Remove patches merged upstream
+
 * Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.22.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 
diff --git a/sources b/sources
index ffb19c8..374e014 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-16bb8eb3bdd3d93813295463bb949705  wheel-0.22.0.tar.gz
+3b0d66f0d127ea8befaa5d11453107fd  wheel-0.24.0.tar.gz
diff --git a/wheel-0.22-add-test-files-to-manifest.path b/wheel-0.22-add-test-files-to-manifest.path
deleted file mode 100644
index 2f10a21..0000000
--- a/wheel-0.22-add-test-files-to-manifest.path
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -r e59e807a91a8 MANIFEST.in
---- a/MANIFEST.in	Mon Sep 23 10:46:53 2013 +0200
-+++ b/MANIFEST.in	Thu Nov 28 12:47:15 2013 +0100
-@@ -1,4 +1,7 @@
- include wheel/*.txt *.txt *.sh
- recursive-include wheel/test *.py
-+include wheel/test/test-1.0-py2.py3-none-win32.whl
-+include wheel/test/headers.dist/header.h
-+include wheel/test/pydist-schema.json
- prune wheel/test/*/dist
- prune wheel/test/*/build
diff --git a/wheel-0.22-fix-tests-broken-by-keyring-fix.patch b/wheel-0.22-fix-tests-broken-by-keyring-fix.patch
deleted file mode 100644
index 2a61c49..0000000
--- a/wheel-0.22-fix-tests-broken-by-keyring-fix.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -r e59e807a91a8 wheel/test/test_tool.py
---- a/wheel/test/test_tool.py	Mon Sep 23 10:46:53 2013 +0200
-+++ b/wheel/test/test_tool.py	Thu Nov 28 13:38:04 2013 +0100
-@@ -3,13 +3,14 @@
- def test_keygen():    
-     def get_keyring():
-         WheelKeys, keyring = tool.get_keyring()
--        
-         class WheelKeysTest(WheelKeys):
-             def save(self):
-                 pass
-         
-         class keyringTest:
-             backend = keyring.backend
-+            class backends:
-+                file = keyring.backends.file
-             @classmethod
-             def get_keyring(cls):
-                 class keyringTest2:
diff --git a/wheel-0.22-legacy-keyring-compatibility.patch b/wheel-0.22-legacy-keyring-compatibility.patch
deleted file mode 100644
index 219915d..0000000
--- a/wheel-0.22-legacy-keyring-compatibility.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-changeset:   313:e59e807a91a8
-tag:         tip
-user:        Pierre Jaury <pierre@jaury.eu>
-date:        Mon Sep 23 10:46:53 2013 +0200
-summary:     Fix #85 regarding backward compatibility with python-keyring <= 3.0
-
-diff -r bae6c45073bd -r e59e807a91a8 wheel/tool/__init__.py
---- a/wheel/tool/__init__.py	Sun Sep 15 18:08:42 2013 -0400
-+++ b/wheel/tool/__init__.py	Mon Sep 23 10:46:53 2013 +0200
-@@ -47,7 +47,7 @@
-     kr = keyring.get_keyring()
-     kr.set_password("wheel", vk, sk)
-     sys.stdout.write("Created Ed25519 keypair with vk={0}\n".format(vk))
--    if isinstance(kr, keyring.backend.BasicFileKeyring):
-+    if isinstance(kr, keyring.backends.file.BaseKeyring):
-         sys.stdout.write("in {0}\n".format(kr.file_path))
-     else:
-         sys.stdout.write("in %r\n" % kr.__class__)
-