diff --git a/python-simplejson.changes b/python-simplejson.changes
index 59681e0..2ff6116 100644
--- a/python-simplejson.changes
+++ b/python-simplejson.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Sep 20 13:59:30 UTC 2011 - saschpe@suse.de
+
+- Re-add python-distribute, you can't simply remove that, it breaks RPM updates
+
 -------------------------------------------------------------------
 Tue Sep  6 22:10:51 UTC 2011 - alexandre@exatati.com.br
 
diff --git a/python-simplejson.spec b/python-simplejson.spec
index e8e4e94..144c36c 100644
--- a/python-simplejson.spec
+++ b/python-simplejson.spec
@@ -16,24 +16,22 @@
 #
 
 
-%{!?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)")}
 
-%define mod_name simplejson
-
-Name:           python-%{mod_name}
+Name:           python-simplejson
 Version:        2.2.1
-Release:        1
+Release:        0
 Url:            http://github.com/simplejson/simplejson
 Summary:        Simple, fast, extensible JSON encoder/decoder for Python
-License:        MIT License
+License:        MIT
 Group:          Development/Languages/Python
-Source:         %{mod_name}-%{version}.tar.bz2
+Source:         simplejson-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 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
 simplejson is a simple, fast, complete, correct and extensible
@@ -42,18 +40,14 @@ with no dependencies, but includes an optional C extension for a
 serious speed boost.
 
 %prep
-%setup -q -n %{mod_name}-%{version}
+%setup -q -n simplejson-%{version}
 
 %build
-export CFLAGS="%{optflags}"
-python setup.py build
+CFLAGS="%{optflags} -fno-strict-aliasing" python setup.py build
 
 %install
 python setup.py install --prefix=%{_prefix} --root=%{buildroot}
 
-%clean
-rm -rf %{buildroot}
-
 %files
 %defattr(-,root,root)
 %{python_sitearch}/*