diff --git a/.cvsignore b/.cvsignore
index c25f41d..2c5f477 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-Cheetah-2.2.1.tar.gz
+Cheetah-2.2.2.tar.gz
diff --git a/python-cheetah.spec b/python-cheetah.spec
index a9d2010..6763e31 100644
--- a/python-cheetah.spec
+++ b/python-cheetah.spec
@@ -1,9 +1,9 @@
 %{!?python_sitearch: %global python_sitearch %([ -x %{__python} ] && %{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)" || :)}
 
 Name:           python-cheetah
-Version:        2.2.1
-Release:        2%{?dist}
-Summary:        Template engine and code-generator
+Version:        2.2.2
+Release:        1%{?dist}
+Summary:        Template engine and code generator
 
 Group:          Development/Libraries
 License:        MIT
@@ -16,6 +16,8 @@ BuildRequires: python
 BuildRequires: python-devel
 BuildRequires: python-setuptools
 
+Requires: python-markdown >= 2.0.1
+
 %description
 Cheetah is an open source template engine and code generation tool,
 written in Python. It can be used standalone or combined with other
@@ -27,12 +29,10 @@ code, Java, sql, form emails and even Python code.
 %setup -q -n Cheetah-%{version}
 
 %build
-export CHEETAH_USE_SETUPTOOLS=1
 %{__python} setup.py build
 
 %install
 rm -rf %{buildroot}
-export CHEETAH_USE_SETUPTOOLS=1
 %{__python} setup.py install -O1 --skip-build --root %{buildroot}
 
 %check
@@ -71,17 +71,15 @@ rm -rf %{buildroot}
 %dir %{python_sitearch}/Cheetah/Utils
 %{python_sitearch}/Cheetah/Utils/*.py*
 
-%dir %{python_sitearch}/Cheetah/contrib
-%{python_sitearch}/Cheetah/contrib/*.py*
-
-%dir %{python_sitearch}/Cheetah/contrib/markdown
-%{python_sitearch}/Cheetah/contrib/markdown/*.py*
-
 %dir %{python_sitearch}/Cheetah-%{version}-*.egg-info
 %{python_sitearch}/Cheetah-%{version}-*.egg-info/PKG-INFO
 %{python_sitearch}/Cheetah-%{version}-*.egg-info/*.txt
 
 %changelog
+* Mon Sep 14 2009 Mike Bonnet <mikeb@redhat.com> - 2.2.2-1
+- update to the 2.2.2 release
+- add dependency on python-markdown for consistency with the egg-info
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.2.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
diff --git a/sources b/sources
index ee96c9b..9dc73fc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-137491aef378b502b2ee71c03b929faf  Cheetah-2.2.1.tar.gz
+e0d89113ab6bb0935d2b67395960264c  Cheetah-2.2.2.tar.gz