diff --git a/.gitignore b/.gitignore
index 7e62d5e..d8fdb3d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /Chameleon-1.2.12.tar.gz
+/Chameleon-2.2.tar.gz
diff --git a/python-chameleon.spec b/python-chameleon.spec
index 420d577..4a42709 100644
--- a/python-chameleon.spec
+++ b/python-chameleon.spec
@@ -3,19 +3,14 @@
 %global srcname Chameleon
 
 Name:           python-chameleon
-Version:        1.2.12
-Release:        4%{?dist}
+Version:        2.2
+Release:        1%{?dist}
 Summary:        XML-based template compiler
 
 Group:          Development/Languages
 License:        BSD
 URL:            http://chameleon.repoze.org/
-Source0:        http://pypi.python.org/packages/source/C/Chameleon/Chameleon-1.2.12.tar.gz
-# setup.py specifies specific versions but newer versions can work as well.
-# Loosen those deps up so we can run with the system packages installed
-Patch0: python-chameleon-loosen-deps.patch
-# Python2.7 changes the Excpetions that are raised by elementtree
-Patch1: python-chameleon-py27.patch
+Source0:        http://pypi.python.org/packages/source/C/Chameleon/Chameleon-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -26,9 +21,6 @@ BuildRequires: python-sphinx
 BuildRequires: python-setuptools
 BuildRequires: python-lxml
 BuildRequires: python-zope-interface
-# These are reviewed but not yet in the Buildroot to build against
-#BuildRequires: python-zope-i18n
-#BuildRequires: python-zope-component 
 
 %if 0%{?rhel} && 0%{?rhel} < 6
 BuildRequires: python-elementtree
@@ -36,10 +28,8 @@ Requires: python-elementtree
 %endif
 
 Requires: python-setuptools
+Requires: python-zope-interface
 Requires: python-lxml
-# These are optional dependencies.  Will add them once they're reviewed and in Fedora
-#Requires: python-zope-i18n
-#Requires: python-zope-component
 
 
 %description
@@ -53,11 +43,6 @@ use run-time interpretation.
 
 %prep
 %setup -q -n %{srcname}-%{version}
-%patch0 -p1
-%if 0%{?fedora} >= 14
-# Elementree behaviour only changed in python-2.7
-%patch1 -p1
-%endif
 
 %build
 %{__python} setup.py build
@@ -78,23 +63,26 @@ find %{buildroot}%{python_sitelib}/chameleon -name '*.txt' -exec rm \{\} \;
 mv _build/html .
 rm -rf html/.buildinfo
 
-mv %{buildroot}%{python_sitelib}/chameleon/ast/COPYING COPYING.ast
+%check
+%{__python} setup.py test
 
 %clean
 rm -rf %{buildroot}
 
-# We can enable these when the BuildRequires are satisfied
-#check
-#{__python} setup.py test
-
 %files
 %defattr(-,root,root,-)
-%doc *.rst *.txt html COPYING.ast
-%{_bindir}/*
+%doc *.rst *.txt docs html
 %{python_sitelib}/*
 
 
 %changelog
+* Wed Aug 10 2011 Toshio Kuratomi <toshio@fedoraproject.org> - 2.2-1
+- New upstream release
+
+* Fri Jul 15 2011 Toshio Kuratomi <toshio@fedoraproject.org> - 2.0-1
+- New upstream release
+- This release removes the genshi-like syntax support -- F17+, only
+
 * Sat Sep 18 2010 Toshio Kuratomi <toshio@fedoraproject.org> - 1.2.12-4
 - Move COPYING file out of the ast directory and into docdir.
 
diff --git a/sources b/sources
index 46819b9..deed98a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-eeef119cc646698562a0dfed13e33285  Chameleon-1.2.12.tar.gz
+ece929128622340cac3ee5bb6b4239eb  Chameleon-2.2.tar.gz