diff --git a/.gitignore b/.gitignore
index 58524c8..f438e81 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /kitchen-0.2.1a1.tar.gz
+/kitchen-0.2.2.tar.gz
diff --git a/python-kitchen.spec b/python-kitchen.spec
index dabada9..6400c2e 100644
--- a/python-kitchen.spec
+++ b/python-kitchen.spec
@@ -1,20 +1,25 @@
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
 
 Name:           python-kitchen
-Version:        0.2.1
-Release:        0.1.a1%{?dist}
+Version:        0.2.2
+Release:        1%{?dist}
 Summary:        Small, useful pieces of code to make python coding easier
 
 Group:          Development/Languages
 License:        LGPLv2+
-URL:            https://fedorahosted.org//kitchen/
-Source0:        https://fedorahosted.org/releases/k/i/kitchen/kitchen-%{version}a1.tar.gz
+URL:            https://pypi.python.org/pypi/kitchen/
+Source0:        https://fedorahosted.org/releases/k/i/kitchen/kitchen-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 BuildRequires:  python2-devel
 BuildRequires:  python-nose
-%if 0%{?fedora}
+%if 0%{?fedora} || 0%{?rhel} >=  6
+# sphinx needs to be more recent to build the html docs
+BuildRequires: python-sphinx
+%endif
+%if 0%{?fedora} || 0%{?rhel} >  6
+# At present, chardet isn't present in epel but it's a soft dep
 BuildRequires: python-chardet
 Requires: python-chardet
 %endif
@@ -26,12 +31,16 @@ columns a string takes), and compatibility modules for writing code that uses
 python-2.7 modules but needs to run on python-2.3 
 
 %prep
-%setup -q -n kitchen-%{version}a1
+%setup -q -n kitchen-%{version}
 
 
 %build
 %{__python} setup.py build
-
+# Build docs
+%if 0%{?fedora} || 0%{?rhel} >= 6
+%{__python} setup.py build_sphinx
+cp -pr build/sphinx/html .
+%endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -50,10 +59,18 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,-)
 %doc COPYING README NEWS COPYING.LESSER docs/
+%if 0%{?fedora} || 0%{?rhel} >= 6
+%doc html
+%endif
 %{python_sitelib}/*
 
 
 %changelog
+* Mon Jan 3 2011 Toshio Kuratomi <toshio@fedoraproject.org> - 0.2.2-1
+- Upstream update 0.2.2
+  - Adds exception to message functions
+- Build html docs
+
 * Thu Sep 2 2010 Toshio Kuratomi <toshio@fedoraproject.org> - 0.2.1-0.1.a1
 - Update to upstream 0.2.1a1 release.
 - Fixes build on python-2.7, adds iterutils module, optimizes some functions,
diff --git a/sources b/sources
index 945a058..3f7d020 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d2d561b5d136eaf82e2f1e140a19946e  kitchen-0.2.1a1.tar.gz
+06269f9aa9c5c125dce91ea2b2d3f4c5  kitchen-0.2.2.tar.gz