diff --git a/python-psutil.changes b/python-psutil.changes
index adef562..c7cdc34 100644
--- a/python-psutil.changes
+++ b/python-psutil.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Mar 23 09:44:42 UTC 2012 - saschpe@suse.de
+
+- Spec file cleanup:
+  * No need for setuptools here, distribute replaces it completely
+  * Macro simplifcation
+
 -------------------------------------------------------------------
 Mon Mar 19 22:00:43 UTC 2012 - cfarrell@suse.com
 
diff --git a/python-psutil.spec b/python-psutil.spec
index c8fa23a..dc2ff97 100644
--- a/python-psutil.spec
+++ b/python-psutil.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package python-pyrasite
+# spec file for package python-psutil
 #
 # Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -11,45 +11,35 @@
 # case the license is the MIT License). An "Open 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/
 #
-%define modname psutil
-Name:           python-%{modname}
+
+Name:           python-psutil
 Version:        0.4.1
 Release:        0
-Url:            http://code.google.com/p/psutil/
-Summary:        A process utilities module for Python
 License:        BSD-3-Clause
+Summary:        A process utilities module for Python
+Url:            http://code.google.com/p/psutil/
 Group:          Development/Languages/Python
-Source:         %{modname}-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+Source:         psutil-%{version}.tar.gz
 BuildRequires:  python-devel
-%if 0%{?suse_version} < 1210
-BuildRequires:  python-setuptools
-%else
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  python-distribute
+%if 0%{?suse_version} && 0%{?suse_version} <= 1110
+%{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%else
+BuildArch:      noarch
 %endif
-%if 0%{?suse_version}
-%py_requires
-%if 0%{?suse_version} > 1110
-%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)")}
 
 %description
 A graphical interface that lets you easily analyze and introspect unaltered running Python processes.
 
-Authors
-~~~~~~~
-Luke Macken <lmacken@redhat.com>
-David Malcolm <dmalcolm@redhat.com>
-
 %prep
-%setup -q -n %{modname}-%{version}
+%setup -q -n psutil-%{version}
+
 %build
-CFLAGS="%{optflags}" python setup.py build
+python setup.py build
 
 %install
 python setup.py install --prefix=%{_prefix} --root=%{buildroot}