diff --git a/python-M2Crypto.changes b/python-M2Crypto.changes
index 1996b6e..4515edb 100644
--- a/python-M2Crypto.changes
+++ b/python-M2Crypto.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Sep 22 09:18:45 UTC 2011 - saschpe@suse.de
+
+- Use SPDX style license
+- Require python-distribute instead of python-setuptools
+- Don't package testsuite
+
 -------------------------------------------------------------------
 Tue May 31 08:18:39 UTC 2011 - saschpe@suse.de
 
diff --git a/python-M2Crypto.spec b/python-M2Crypto.spec
index b464bd0..9d018a8 100644
--- a/python-M2Crypto.spec
+++ b/python-M2Crypto.spec
@@ -19,25 +19,24 @@
 
 Name:           python-M2Crypto
 Version:        0.21.1
-Release:        1
+Release:        0
 Url:            http://chandlerproject.org/bin/view/Projects/MeTooCrypto
 Summary:        Crypto and SSL toolkit for Python
-License:        X11/MIT, ZPLv2, BSD3c
+License:        X11/MIT, ZPL-2.0, BSD-3-Clause
 Group:          Development/Languages/Python
 Source:         M2Crypto-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  python-devel
-BuildRequires:  python-setuptools
+BuildRequires:  python-distribute
 BuildRequires:  swig
-BuildRequires:  openssl-devel
 BuildRequires:  openssl
+BuildRequires:  openssl-devel
 %if 0%{?suse_version}
 %py_requires
 %if 0%{?suse_version} > 1010
 BuildRequires:  fdupes
 %endif
 %endif
-%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 Provides:       python-m2crypto = %{version}
 # TODO: Change <= back to = with new upstream release
@@ -62,24 +61,18 @@ original M2Crypto homepage is at http://sandbox.rulemaker.net/ngps/m2/.
 %setup -n M2Crypto-%{version}
 
 %build
-export CFLAGS="%{optflags}"
-python setup.py build
+CFLAGS="%{optflags}" python setup.py build
 
 %install
-sed -i 's|\r||g' tests/thawte.pem # Fix wrong EOL
-# Fix executable bit for documentation:
-chmod 0644 demo/{https.howto/get_https,ssl/twistedsslclient,ssl/twistedsslserver,tinderbox/slave,x509/certdata2pem}.py tests/test_bn.py
+chmod 0644 demo/{https.howto/get_https,ssl/twistedsslclient,ssl/twistedsslserver,tinderbox/slave,x509/certdata2pem}.py # Fix executable bit for documentation:
 python setup.py install --prefix=%{_prefix} --root=%{buildroot}
 %if 0%{?suse_version} > 1010
 %fdupes -s .
 %endif
 
-%clean
-rm -rf %{buildroot}
-
 %files
 %defattr(-,root,root)
-%doc CHANGES LICENCE README demo tests
+%doc CHANGES LICENCE README demo
 %{python_sitearch}/*
 
 %changelog