diff --git a/python-netaddr.changes b/python-netaddr.changes
index 5750615..ebb57c0 100644
--- a/python-netaddr.changes
+++ b/python-netaddr.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Tue Sep 20 13:40:39 UTC 2011 - saschpe@suse.de
+
+- Fixed non-executable script rpmlint warning
+- Readded dependency on python-setuptools (with python-distribute):
+  You can't simply remove this, it will break RPMs update mechanism!
+- Preparatory stuff belongs into the %prep section and the %clean
+  section has a sane default
+
 -------------------------------------------------------------------
 Wed Sep 14 00:32:39 UTC 2011 - alexandre@exatati.com.br
 
diff --git a/python-netaddr.spec b/python-netaddr.spec
index b8d298b..33b67ba 100644
--- a/python-netaddr.spec
+++ b/python-netaddr.spec
@@ -15,9 +15,6 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-%{!?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)")}
-
 Name:           python-netaddr
 Version:        0.7.6
 Release:        0
@@ -28,12 +25,14 @@ Group:          Development/Languages/Python
 Source:         netaddr-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  python-devel
+BuildRequires:  python-distribute
 %if 0%{?suse_version}
 %py_requires
 %if 0%{?suse_version} > 1110
 BuildArch:      noarch
 %endif
 %endif
+%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 %description
 A pure Python network address representation and manipulation library.
@@ -54,17 +53,14 @@ Included are routines for:
 
 %prep
 %setup -q -n netaddr-%{version}
+sed -i "1d" netaddr/{ip/iana,eui/ieee,tests/__init__}.py # Fix non-executable scripts
+chmod -x AUTHORS CHANGELOG COPYRIGHT README LICENSE THANKS # Remove executable bit from docs
 
 %build
-export CFLAGS="%{optflags}"
 python setup.py build
 
 %install
 python setup.py install --prefix=%{_prefix} --root=%{buildroot}
-%{__chmod} -x AUTHORS CHANGELOG COPYRIGHT README LICENSE THANKS # remove executable bit from docs
-
-%clean
-rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)