diff --git a/python-tornado.changes b/python-tornado.changes
index 399119b..b32204f 100644
--- a/python-tornado.changes
+++ b/python-tornado.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Jan 30 23:17:07 UTC 2012 - alexandre@exatati.com.br
+
+- Update to 2.2:
+  - Please read http://www.tornadoweb.org/documentation/releases/v2.2.0.html
+    for all changes in this release.
+
 -------------------------------------------------------------------
 Tue Oct  4 23:57:09 UTC 2011 - alexandre@exatati.com.br
 
diff --git a/python-tornado.spec b/python-tornado.spec
index 41c4408..98150cf 100644
--- a/python-tornado.spec
+++ b/python-tornado.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package python-tornado
 #
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -15,8 +15,11 @@
 # 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-tornado
-Version:        2.1.1
+Version:        2.2
 Release:        0
 Url:            http://www.tornadoweb.org
 Summary:        Open source version of scalable, non-blocking web server that power FriendFeed
@@ -33,7 +36,6 @@ Requires:       python-simplejson
 BuildArch:      noarch
 %endif
 %endif
-%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 %description
 Tornado is an open source version of the scalable, non-blocking web server and tools that power FriendFeed.
@@ -51,14 +53,11 @@ thousands of clients, see The C10K problem.)
 %setup -q -n tornado-%{version}
 
 %build
-CFLAGS="%{optflags}" python setup.py build
+python setup.py build
 
 %install
 python setup.py install --prefix=%{_prefix} --root=%{buildroot}
 
-%clean
-rm -rf %{buildroot}
-
 %files
 %defattr(-,root,root,-)
 %doc README demos
diff --git a/tornado-2.1.1.tar.bz2 b/tornado-2.1.1.tar.bz2
deleted file mode 100644
index c3eb90e..0000000
--- a/tornado-2.1.1.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4535662144bfa9f73f49340040bb6c8db88628d8b9d85b57ae013203806c8e7c
-size 275985
diff --git a/tornado-2.2.tar.bz2 b/tornado-2.2.tar.bz2
new file mode 100644
index 0000000..9aa3b3a
--- /dev/null
+++ b/tornado-2.2.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1e47ce02fa3c0037af1904e55843aec6739f1192d14128d5afdf1d09dd1ffe98
+size 285743