diff --git a/python-greenlet.changes b/python-greenlet.changes
index f0fce17..cae487f 100644
--- a/python-greenlet.changes
+++ b/python-greenlet.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Wed Sep 21 09:35:58 UTC 2011 - saschpe@suse.de
+
+- Spec file cleanup:
+  * BuildRequire modern python-distribute instead of python-setuptools
+  * No need for changing executable bits for benchmarks
+  * Use SUSE version checks around specific macros
+  * Only require %{name} = %{version} in devel package
+
 -------------------------------------------------------------------
 Fri Nov 26 14:44:42 UTC 2010 - seife+obs@b1-systems.com
 
diff --git a/python-greenlet.spec b/python-greenlet.spec
index a37945d..857b3c4 100644
--- a/python-greenlet.spec
+++ b/python-greenlet.spec
@@ -1,37 +1,36 @@
 #
 # spec file for package python-greenlet
 #
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # Copyright (c) 2010 B1 Systems GmbH, Vohburg, Germany.
+# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
 # upon. The license for this file, and modifications and additions to the
 # file, is the same license as for the pristine package itself (unless the
 # license for the pristine package is not an Open Source License, in which
-# case the license is the MIT License). An "Open Source License" is a
+# case the license is the MIT License). An "O2en Source License" is a
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
-
+#
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-# norootforbuild
-
-
 Name:           python-greenlet
 Version:        0.3.1
-Release:        1
+Release:        0
+URL:            http://pypi.python.org/pypi/greenlet
 Summary:        Lightweight in-process concurrent programming
-Group:          Development/Libraries/Python
 License:        MIT
-Url:            http://pypi.python.org/pypi/greenlet
+Group:          Development/Libraries/Python
 Source0:        http://pypi.python.org/packages/source/g/greenlet/greenlet-%{version}.tar.gz
-BuildRequires:  python-devel
-BuildRequires:  python-setuptools
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-# py_requires is no longer needed since 11.3
-%{py_requires}
+BuildRequires:  python-devel
+BuildRequires:  python-distribute
+%if 0%{?suse_version}
+%py_requires
+%endif
+%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 %description
 The greenlet package is a spin-off of Stackless, a version of CPython
@@ -40,10 +39,9 @@ pseudo-concurrently (typically in a single or a few OS-level threads)
 and are synchronized with data exchanges on "channels".
 
 %package devel
-
 Summary:        C development headers for python-greenlet
 Group:          Development/Libraries/Python
-Requires:       %{name} = %{version}-%{release}
+Requires:       %{name} = %{version}
 
 %description devel
 This package contains header files required for C modules development.
@@ -52,15 +50,15 @@ This package contains header files required for C modules development.
 %setup -q -n greenlet-%{version}
 
 %build
-CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
-chmod 644 benchmarks/*.py
+CFLAGS="%{optflags} -fno-strict-aliasing" python setup.py build
 
 %install
-%{__python} setup.py install --prefix=%{_prefix} --root=%{buildroot} --record-rpm=INSTALLED_FILES
-grep -v greenlet/greenlet.h$ INSTALLED_FILES > INSTALLED_FILES_nodevel
+python setup.py install --prefix=%{_prefix} --root=%{buildroot}
 
-%files -f INSTALLED_FILES_nodevel
+%files
 %defattr(-,root,root)
+%doc AUTHORS NEWS README
+%{python_sitearch}/*
 
 %files devel
 %defattr(-,root,root,-)