diff --git a/cryptography-0.2.1.tar.gz b/cryptography-0.2.1.tar.gz
deleted file mode 100644
index bad7059..0000000
--- a/cryptography-0.2.1.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5b4b93a9841364396ac75ee3f0f4550752821df5a89078c1e16a716339ba39a3
-size 13772304
diff --git a/cryptography-0.2.1.tar.gz.asc b/cryptography-0.2.1.tar.gz.asc
deleted file mode 100644
index ed7f9e6..0000000
--- a/cryptography-0.2.1.tar.gz.asc
+++ /dev/null
@@ -1,11 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.14 (Darwin)
-
-iQEcBAABAgAGBQJTCRq2AAoJECNa5fEp+e2YwFwH/1lZvBH65IoATa3RjG9gg7lM
-j5mLp8cP4WOdPJEMDil8FuhH4+IrD5g51tWdqHnwnC9GHubF/4VvwllzbQxzQTi8
-oG9RQ3BAKoTT+zDPWIqe49ZTkL5KH3kUDWYvkco6In7ArpBJmg9gZ9/ZwWyLYQqK
-g8bgZnrWTsRNxFmlhKiV8jJOsyzzbyHU436LLG2T4OVs6QazxBALogZVqe3hL7ql
-K1aGbU0+NW5R9s+Hy5MrL02hLjTvqb5kLbjKJPUvSMsPZ7rlm5Xh9HCa+BmrE5e3
-lPtOWy5TxmZYQrLNZrWGO4jpkNPk9cwyGEyq4g5/HuARS/UdBLjvr4ELg9BqRDU=
-=T8HZ
------END PGP SIGNATURE-----
diff --git a/cryptography-0.4.tar.gz b/cryptography-0.4.tar.gz
new file mode 100644
index 0000000..47daea7
--- /dev/null
+++ b/cryptography-0.4.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5ef81de44c87a87779710cbb476ffbec86a4a6c0bd2a5bebeccc3bfb3c3478e5
+size 260891
diff --git a/cryptography-0.4.tar.gz.asc b/cryptography-0.4.tar.gz.asc
new file mode 100644
index 0000000..b69c7ea
--- /dev/null
+++ b/cryptography-0.4.tar.gz.asc
@@ -0,0 +1,11 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1
+
+iQEcBAABAgAGBQJTZQMCAAoJECNa5fEp+e2Y1dQIAJug02N0TO4pPSiKMpCBJiWo
+ucismrKQ4l11VLLOMEvbYnAnEQei8+nvN0NZhj8Xkfm0IkkyyISAy48CB008Mig6
+YMSbiPQl/dhBjldP88ta6ChDusJEB+ceXN9bPAIsX9xj2RcRjN03e4OODIlWyxqe
+LHHX612boHZ8T5tlnX9ch6AmKV2nE4towVYjK5DE5J6nej+nOxFTxo/CuadKDwo9
+CWJUDNUOt1K6ya4v9JzctqhrBO6h8W1RpVKK5i2V6wp6xm8iwVr5Mw4C2w3zkPxT
+n9PitTTD8u0ZORkXHKdwdiers0yxu6LG/98Z+hEUTaXkk9tfPngnJVnhpk3rHwY=
+=qrAT
+-----END PGP SIGNATURE-----
diff --git a/cryptography-custom-install-cmd.patch b/cryptography-custom-install-cmd.patch
deleted file mode 100644
index 12a20d9..0000000
--- a/cryptography-custom-install-cmd.patch
+++ /dev/null
@@ -1,80 +0,0 @@
---- a/setup.py	2014-02-22 22:35:18.000000000 +0100
-+++ b/setup.py	2014-03-31 18:02:28.144820932 +0200
-@@ -12,6 +12,7 @@
- # limitations under the License.
- import os
- from distutils.command.build import build
-+from distutils.command.install import install
- 
- from setuptools import setup, find_packages
- 
-@@ -32,6 +33,27 @@
- ]
- 
- 
-+def get_ext_modules():
-+    from cryptography.hazmat.bindings.commoncrypto.binding import (
-+        Binding as CommonCryptoBinding
-+    )
-+    from cryptography.hazmat.bindings.openssl.binding import (
-+        Binding as OpenSSLBinding
-+    )
-+    from cryptography.hazmat.primitives import constant_time, padding
-+
-+    ext_modules = [
-+        OpenSSLBinding().ffi.verifier.get_extension(),
-+        constant_time._ffi.verifier.get_extension(),
-+        padding._ffi.verifier.get_extension()
-+    ]
-+    if CommonCryptoBinding.is_available():
-+        ext_modules.append(
-+            CommonCryptoBinding().ffi.verifier.get_extension()
-+        )
-+    return ext_modules
-+
-+
- class cffi_build(build):
-     """
-     This class exists, instead of just providing ``ext_modules=[...]`` directly
-@@ -43,25 +65,17 @@
-     """
- 
-     def finalize_options(self):
--        from cryptography.hazmat.bindings.commoncrypto.binding import (
--            Binding as CommonCryptoBinding
--        )
--        from cryptography.hazmat.bindings.openssl.binding import (
--            Binding as OpenSSLBinding
--        )
--        from cryptography.hazmat.primitives import constant_time, padding
-+        self.distribution.ext_modules = get_ext_modules()
-+        build.finalize_options(self)
- 
--        self.distribution.ext_modules = [
--            OpenSSLBinding().ffi.verifier.get_extension(),
--            constant_time._ffi.verifier.get_extension(),
--            padding._ffi.verifier.get_extension()
--        ]
--        if CommonCryptoBinding.is_available():
--            self.distribution.ext_modules.append(
--                CommonCryptoBinding().ffi.verifier.get_extension()
--            )
- 
--        build.finalize_options(self)
-+class cffi_install(install):
-+    """
-+    As a consequence...
-+    """
-+    def finalize_options(self):
-+        self.distribution.ext_modules = get_ext_modules()
-+        install.finalize_options(self)
- 
- 
- with open(os.path.join(base_dir, "README.rst")) as f:
-@@ -111,5 +125,6 @@
-     ext_package="cryptography",
-     cmdclass={
-         "build": cffi_build,
-+        "install": cffi_install
-     }
- )
diff --git a/cryptography_vectors-0.4.tar.gz b/cryptography_vectors-0.4.tar.gz
new file mode 100644
index 0000000..14527f3
--- /dev/null
+++ b/cryptography_vectors-0.4.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:736bf5f14dbde7a5600c5dfe4a8563435be7e91dc060cee4c5f67287b692769e
+size 19092510
diff --git a/cryptography_vectors-0.4.tar.gz.asc b/cryptography_vectors-0.4.tar.gz.asc
new file mode 100644
index 0000000..ffebec2
--- /dev/null
+++ b/cryptography_vectors-0.4.tar.gz.asc
@@ -0,0 +1,11 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1
+
+iQEcBAABAgAGBQJTZQIVAAoJECNa5fEp+e2YXPkH/3xzC1QVY9vLPuOLBkkgU1od
+ZNe6jpB9pqxmycxWF2h/RPt7pRS1ejjd+jorCKdLNsV8lMJ5lZtSxL+E71ut6XX1
+Qo8n2XjIRrPftHO5HFBGHuTwyRhivNSXgX94fFEGOFGyTI8dKRcJFyyZgrsU29lK
+w5oLyaLNDLsTM7RiglVUl86cwlmzvR/eBBsMjU7kPdwBx5/skPAE95BP/3yzC3IV
+Vl0KS5roRIWxN45ur2th0LxjFsR8FmMwB0l8VgcGsU+lI3H/u56YlFBQ+/bvn4af
+OkAtcabwBmJwhCnIfSBmT/CdkguK9g7ivr93+Dj00t/Y+yRurp1WjiKpWiCUIkc=
+=HxnD
+-----END PGP SIGNATURE-----
diff --git a/python-cryptography.changes b/python-cryptography.changes
index b5d1aea..0e4006f 100644
--- a/python-cryptography.changes
+++ b/python-cryptography.changes
@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Mon May 19 16:14:52 UTC 2014 - jmatejek@suse.com
+
+- update to 0.4
+    * added IDEA algorithm
+    * added HOTP, TOTP and CMAC primitives
+    * improved support for RSA and DSA public key cryptography
+- include cryptography_vectors as a source, in order to run the full
+  test suite (cryptography_vectors seems only useful for testing
+  this module, so it's probably not worth making a separate installable
+  package for it)
+- drop upstreamed cryptography-custom-install-cmd.patch
+
 -------------------------------------------------------------------
 Mon Mar 31 16:03:46 UTC 2014 - speilicke@suse.com
 
diff --git a/python-cryptography.spec b/python-cryptography.spec
index 51b9b2b..cfbfab4 100644
--- a/python-cryptography.spec
+++ b/python-cryptography.spec
@@ -17,7 +17,7 @@
 
 
 Name:           python-cryptography
-Version:        0.2.1
+Version:        0.4
 Release:        0
 Url:            https://cryptography.io/en/latest/
 Summary:        Python library which exposes cryptographic recipes and primitives
@@ -26,8 +26,8 @@ Group:          Development/Languages/Python
 Source0:        https://pypi.python.org/packages/source/c/cryptography/cryptography-%{version}.tar.gz
 Source1:        https://pypi.python.org/packages/source/c/cryptography/cryptography-%{version}.tar.gz.asc
 Source2:        %{name}.keyring
-# PATCH-FIX-UPSTREAM speilicke@suse.com -- Backport of https://github.com/pyca/cryptography/pull/872
-Patch0:         cryptography-custom-install-cmd.patch
+Source3:        https://pypi.python.org/packages/source/c/cryptography-vectors/cryptography_vectors-%{version}.tar.gz
+Source4:        https://pypi.python.org/packages/source/c/cryptography-vectors/cryptography_vectors-%{version}.tar.gz.asc
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %if 0%{suse_version} && 0%{?suse_version} >= 1220
 BuildRequires:  gpg-offline
@@ -40,6 +40,7 @@ BuildRequires:  python-six >= 1.4.1
 # Test requirements
 BuildRequires:  python-iso8601
 BuildRequires:  python-pretend
+BuildRequires:  python-pyasn1
 BuildRequires:  python-pytest
 Requires:       python-cffi >= 0.8
 Requires:       python-six >= 1.4.1
@@ -66,17 +67,22 @@ functions.
 %gpg_verify %{SOURCE1}
 %endif
 %setup -q -n cryptography-%{version}
-%patch0 -p1
 %if 0%{?suse_version} && 0%{?suse_version} <= 1110
 #TODO(saschpe): Failing on SP3, debug later:
 rm tests/hazmat/primitives/test_rsa.py
 %endif
 
+# prepare vectors module
+tar xvzf %{S:3}
+mv cryptography_vectors-%{version}/cryptography_vectors .
+
 %build
 CFLAGS="%{optflags} -fno-strict-aliasing" python setup.py build
 
 %install
 python setup.py install --prefix=%{_prefix} --root=%{buildroot}
+# do not install cryptography_vectors
+rm -r %{buildroot}%{python_sitearch}/cryptography_vectors
 
 %check
 py.test