diff --git a/python-simplejson.changes b/python-simplejson.changes
index 13a074b..2ff6116 100644
--- a/python-simplejson.changes
+++ b/python-simplejson.changes
@@ -1,3 +1,34 @@
+-------------------------------------------------------------------
+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
+
+- Update to 2.2.1:
+  * Fix MANIFEST.in issue when building a sdist from a sdist.
+    https://github.com/simplejson/simplejson/issues/16
+- Aditional changes from version 2.2.0:
+  * Remove setuptools requirement, reverted to pure distutils
+  * use_decimal default for encoding (dump, dumps, JSONEncoder) is now True
+  * tuple encoding as JSON objects can be turned off with new
+    tuple_as_array=False option.
+    https://github.com/simplejson/simplejson/pull/6
+  * namedtuple (or other tuple subclasses with _asdict methods) are now
+    encoded as JSON objects rather than arrays by default. Can be disabled
+    and treated as a tuple with the new namedtuple_as_object=False option.
+    https://github.com/simplejson/simplejson/pull/6
+  * JSONDecodeError is now raised instead of ValueError when a document
+    ends with an opening quote and the C speedups are in use.
+    https://github.com/simplejson/simplejson/issues/15
+  * Updated documentation with information about JSONDecodeError
+  * Force unicode linebreak characters to be escaped (U+2028 and U+2029)
+    http://timelessrepo.com/json-isnt-a-javascript-subset
+  * Moved documentation from a git submodule to
+    http://simplejson.readthedocs.org/
+
+
 -------------------------------------------------------------------
 Mon May  9 03:20:42 UTC 2011 - alexandre@exatati.com.br
 
diff --git a/python-simplejson.spec b/python-simplejson.spec
index fca97b1..144c36c 100644
--- a/python-simplejson.spec
+++ b/python-simplejson.spec
@@ -16,25 +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}
-Version:        2.1.6
-Release:        1
+Name:           python-simplejson
+Version:        2.2.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
@@ -43,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}/*
diff --git a/simplejson-2.1.6.tar.bz2 b/simplejson-2.1.6.tar.bz2
deleted file mode 100644
index bd2cff1..0000000
--- a/simplejson-2.1.6.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3f46be3ba8d1c9da82db96ccb9e41f5eaef02bca21f6b58862ad051bde099b46
-size 45020
diff --git a/simplejson-2.2.1.tar.bz2 b/simplejson-2.2.1.tar.bz2
new file mode 100644
index 0000000..8f30e6a
--- /dev/null
+++ b/simplejson-2.2.1.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9689c87055f87dc3d5b221e199be5881336ccf0cbf24455794d3dac11204fe77
+size 42876