diff --git a/python-tornado.changes b/python-tornado.changes
index acc4e91..407a1c4 100644
--- a/python-tornado.changes
+++ b/python-tornado.changes
@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Wed Jun 22 11:47:26 UTC 2011 - alexandre@exatati.com.br
+
+- Update to 2.0:
+  Major changes:
+  * Template output is automatically escaped by default; see backwards
+    compatibility note below.
+    * The default AsyncHTTPClient implementation is now simple_httpclient.
+    * Python 3.2 is now supported.
+  For backwards compatibility and other changes in this release,
+  please read http://www.tornadoweb.org/documentation/releases/v2.0.0.html
+- Regenerate spec file with py2pack.
+
 -------------------------------------------------------------------
 Fri Mar  4 04:10:43 UTC 2011 - alexandre@exatati.com.br
 
diff --git a/python-tornado.spec b/python-tornado.spec
index 572dc11..6d548cd 100644
--- a/python-tornado.spec
+++ b/python-tornado.spec
@@ -11,29 +11,31 @@
 # case the license is the MIT License). An "Open Source License" is a
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
-
+#
 # 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:        1.2.1
-Release:        1
-License:        Apache 2.0
-Summary:        Open source version of scalable, non-blocking web server that power FriendFeed
+Version:        2.0
+Release:        0
 Url:            http://www.tornadoweb.org
-Group:          Development/Libraries/Python
+Summary:        Open source version of scalable, non-blocking web server that power FriendFeed
+License:        http://www.apache.org/licenses/LICENSE-2.0
+Group:          Development/Languages/Python
 Source:         tornado-%{version}.tar.bz2
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  python-devel
-BuildRequires:  python-setuptools
 Requires:       python-curl
 Requires:       python-simplejson
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-%{py_requires}
-%if %{?suse_version: %{suse_version} > 1110} %{!?suse_version:1}
+%if 0%{?suse_version}
+%py_requires
+%if 0%{?suse_version} > 1110
 BuildArch:      noarch
 %endif
+%endif
 
 %description
 Tornado is an open source version of the scalable, non-blocking web server and tools that power FriendFeed.
@@ -47,19 +49,21 @@ the web server specifically to handle FriendFeed's real-time features — every
 maintains an open connection to the FriendFeed servers. (For more information on scaling servers to support
 thousands of clients, see The C10K problem.)
 
-Author:
---------
-    Facebook
-
 %prep
 %setup -q -n tornado-%{version}
 
 %build
-%{__python} setup.py build
+export CFLAGS="%{optflags}"
+python setup.py build
 
 %install
-%{__python} setup.py install --prefix=%{_prefix} --root=%{buildroot} --record-rpm=INSTALLED_FILES
+python setup.py install --prefix=%{_prefix} --root=%{buildroot}
+
+%clean
+rm -rf %{buildroot}
+
+%files
+%defattr(-,root,root,-)
+%{python_sitelib}/*
 
-%files -f INSTALLED_FILES
-%defattr(-,root,root)
 %changelog
diff --git a/tornado-1.2.1.tar.bz2 b/tornado-1.2.1.tar.bz2
deleted file mode 100644
index 474828c..0000000
--- a/tornado-1.2.1.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:048788c2ab84835efb86baa416cfff194135f651513fd247ae71c538820a6a09
-size 234245
diff --git a/tornado-2.0.tar.bz2 b/tornado-2.0.tar.bz2
new file mode 100644
index 0000000..d122f39
--- /dev/null
+++ b/tornado-2.0.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:cefecc0cf23c49f8ca0f71fb6e951eac8ff3555092f8d8d3b3b2862b1c8fbec0
+size 248453