diff --git a/python-feedparser.changes b/python-feedparser.changes
index a8bbe40..a4e2705 100644
--- a/python-feedparser.changes
+++ b/python-feedparser.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Sun Feb 19 20:37:04 UTC 2012 - saschpe@gmx.de
+
+- Remove previously added dependency on python-distribute, RPM can't handle
+  updates from files to directores and vice versa (egg-info created by
+  distutils vs. setuptools)
+- Remove outdated %clean section, no CFLAGS for noarch package
+
 -------------------------------------------------------------------
 Thu Jan 12 19:34:06 UTC 2012 - jfunk@funktronics.ca
 
diff --git a/python-feedparser.spec b/python-feedparser.spec
index 27e5803..65c3d0e 100644
--- a/python-feedparser.spec
+++ b/python-feedparser.spec
@@ -16,7 +16,6 @@
 #
 
 
-
 Name:           python-feedparser
 Version:        5.1
 Release:        0
@@ -27,17 +26,13 @@ Url:            http://sourceforge.net/projects/feedparser/
 Source:         feedparser-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  python-devel
-BuildRequires:  python-distribute
 BuildRequires:  python-xml
 Requires:       python-xml
-%if 0%{?suse_version}
-%py_requires
-%if 0%{?suse_version} > 1110
+%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
-%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 universal feed parser module for Python that handles RSS 0.9x, RSS 1.0, RSS
@@ -45,10 +40,10 @@ A universal feed parser module for Python that handles RSS 0.9x, RSS 1.0, RSS
 
 %prep
 %setup -q -n feedparser-%{version}
-chmod 0644 README
+chmod 0644 README # Fix executable bits
+sed -i "1d" feedparser/feedparser.py # Fix non-executable script
 
 %build
-export CFLAGS="%{optflags}"
 python setup.py build
 
 %if 0%{?suse_version} > 1010
@@ -63,10 +58,6 @@ python setup.py build
 
 %install
 python setup.py install --prefix=%{_prefix} --root=%{buildroot}
-chmod 0755 %{buildroot}%{python_sitelib}/feedparser.py
-
-%clean
-rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)