diff --git a/python-celery.changes b/python-celery.changes
index cfc96ab..7adbf04 100644
--- a/python-celery.changes
+++ b/python-celery.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Sat Mar 26 02:05:53 UTC 2011 - alexandre@exatati.com.br
+
+- Regenerate spec file with py2pack;
+- Add Changelog, README and TODO files as documentation.
+
 -------------------------------------------------------------------
 Sun Feb 20 18:43:50 UTC 2011 - alexandre@exatati.com.br
 
diff --git a/python-celery.spec b/python-celery.spec
index 48452a1..a56f603 100644
--- a/python-celery.spec
+++ b/python-celery.spec
@@ -1,7 +1,7 @@
 #
-# spec file for package python-celery (Version 2.2.4)
+# spec file for package python-celery
 #
-# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2011 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
@@ -11,19 +11,25 @@
 # 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/
 #
 
+# norootforbuild
+%{!?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-celery
+%define mod_name celery
+
+Name:           python-%{mod_name}
 Version:        2.2.4
-Release:        1
-License:        BSD License
+Release:        0
+Url:            http://celeryproject.org
 Summary:        Distributed Task Queue
-Url:            http://github.com/ask/celery
-Group:          Development/Libraries/Python
-Source:         celery-%{version}.tar.bz2
+License:        BSD
+Group:          Development/Languages/Python
+Source:         %{mod_name}-%{version}.tar.bz2
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  python-devel
 BuildRequires:  python-setuptools
 Requires:       python-anyjson
@@ -31,40 +37,39 @@ Requires:       python-daemon
 Requires:       python-django-unittest-depth
 Requires:       python-kombu
 Requires:       python-tyrant
-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
-Celery is a distributed task queue.
-It was first created for Django, but is now usable from Python. It can also operate with
-other languages via HTTP+JSON.
-It is used for executing tasks asynchronously, routed to one or more worker servers, running
-concurrently using multiprocessing.
-It is designed to solve certain problems related to running websites demanding high-availability
-and performance.
-It is perfect for filling caches, posting updates to twitter, mass downloading data like
-syndication feeds or web scraping. Use-cases are plentiful. Implementing these features
-asynchronously using celery is easy and fun, and the performance improvements can make it more
-than worthwhile.
-
-Author:
---------
-    Ask Solem <askh@opera.com>
+Celery is an open source asynchronous task queue/job queue based on
+distributed message passing.  It is focused on real-time operation,
+but supports scheduling as well.
 
 %prep
-%setup -q -n celery-%{version}
-
+%setup -q -n %{mod_name}-%{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 -f INSTALLED_FILES
-%defattr(-,root,root)
+%files
+%defattr(-,root,root,-)
+# You may have to add additional files here (documentation and binaries mostly)
+%python_sitelib/%{mod_name}*
+%python_sitelib/funtests*
+%python_sitelib/*.egg-info
+%doc Changelog README TODO
+%{_bindir}/camqadm
+%{_bindir}/celery*
+
+%changelog