diff --git a/.cvsignore b/.cvsignore
index 1452d8e..1146c94 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-Jinja2-2.0.tar.gz
+Jinja2-2.2.1.tar.gz
diff --git a/branch b/branch
new file mode 100644
index 0000000..dc32377
--- /dev/null
+++ b/branch
@@ -0,0 +1 @@
+F-10
diff --git a/import.log b/import.log
index 7f4f039..bdb9ef6 100644
--- a/import.log
+++ b/import.log
@@ -1 +1,4 @@
 python-jinja2-2_0-2_fc9:HEAD:python-jinja2-2.0-2.fc9.src.rpm:1216886150
+python-jinja2-2_1-1_fc11:F-10:python-jinja2-2.1-1.fc11.src.rpm:1229629185
+python-jinja2-2_1_1-1_fc10:F-10:python-jinja2-2.1.1-1.fc10.src.rpm:1231601647
+python-jinja2-2_2_1-1_fc11:F-10:python-jinja2-2.2.1-1.fc11.src.rpm:1253465884
diff --git a/python-jinja2-docs.patch b/python-jinja2-docs.patch
deleted file mode 100644
index 1869540..0000000
--- a/python-jinja2-docs.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up Jinja2-2.0rc1/setup.py.orig Jinja2-2.0rc1/setup.py
---- Jinja2-2.0rc1/setup.py.orig	2008-06-29 01:44:48.000000000 +0200
-+++ Jinja2-2.0rc1/setup.py	2008-06-29 01:48:00.000000000 +0200
-@@ -51,7 +51,7 @@ from distutils.errors import CCompilerEr
- 
- data_files = []
- documentation_path = 'docs/_build/html'
--if os.path.exists(documentation_path):
-+if os.path.exists(documentation_path) and False:
-     documentation_files = []
-     for fn in os.listdir(documentation_path):
-         if not fn.startswith('.'):
diff --git a/python-jinja2.spec b/python-jinja2.spec
index 8262ad3..7f0e836 100644
--- a/python-jinja2.spec
+++ b/python-jinja2.spec
@@ -1,24 +1,16 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:		python-jinja2
-Version:	2.0
-Release:	2%{?dist}
+Version:	2.2.1
+Release:	1%{?dist}
 Summary:	General purpose template engine
-
 Group:		Development/Languages
 License:	BSD
 URL:		http://jinja.pocoo.org/
 Source0:	http://pypi.python.org/packages/source/J/Jinja2/Jinja2-%{version}.tar.gz
-Patch0:		%{name}-docs.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	python-devel
-
-%if 0%{?fedora} >= 8
-BuildRequires: 	python-setuptools-devel
-%else
-BuildRequires:	python-setuptools
-%endif
-
+BuildRequires:	python-setuptools-devel
 Requires:	python-babel >= 0.8
 
 %description
@@ -35,22 +27,26 @@ environments.
 
 %prep
 %setup -q -n Jinja2-%{version}
-%patch0 -p1 -b .docs
 
 
 %build
-CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
+CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py --with-speedups build
 
 
 %install
 rm -rf %{buildroot}
-%{__python} setup.py install -O1 --skip-build --root %{buildroot}
+%{__python} setup.py --with-speedups install -O1 --skip-build \
+	    --root %{buildroot}
 
 # fix EOL
 sed -i 's|\r$||g' LICENSE
 
-# fix wrong permission
-%{__chmod} 0755 %{buildroot}%{python_sitearch}/jinja2/_speedups.so
+# ensure correct permission
+chmod 0755 %{buildroot}%{python_sitearch}/jinja2/_speedups.so
+
+# remove hidden file
+rm -rf docs/_build/html/.buildinfo
+
 
 %clean
 rm -rf %{buildroot}
@@ -64,6 +60,28 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sat Sep 19 2009 Thomas Moschny <thomas.moschny@gmx.de> - 2.2.1-1
+- Update to 2.2.1, mainly a bugfix release.
+- Remove patch no longer needed.
+- Remove conditional for FC-8.
+- Compilation of speedup module has to be explicitly requested now.
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.1.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.1.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Sat Jan 10 2009 Thomas Moschny <thomas.moschny@gmx.de> - 2.1.1-1
+- Update to 2.1.1 (bugfix release).
+
+* Thu Dec 18 2008 Thomas Moschny <thomas.moschny@gmx.de> - 2.1-1
+- Update to 2.1, which fixes a number of bugs.
+  See http://jinja.pocoo.org/2/documentation/changelog#version-2-1.
+
+* Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm@gmail.com> - 2.0-3
+- Rebuild for Python 2.6
+
 * Tue Jul 22 2008 Thomas Moschny <thomas.moschny@gmx.de> - 2.0-2
 - Use rpm buildroot macro instead of RPM_BUILD_ROOT.
 
@@ -72,4 +90,3 @@ rm -rf %{buildroot}
 
 * Sun Jun 29 2008 Thomas Moschny <thomas.moschny@gmx.de> - 2.0-0.1.rc1
 - Modified specfile from the existing python-jinja package.
-
diff --git a/sources b/sources
index 6c640be..b4fdf34 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-19fe3ee10ee94a6003c53374112f2403  Jinja2-2.0.tar.gz
+fea849d68891218eb0b21c170f1c32d5  Jinja2-2.2.1.tar.gz