diff --git a/python-jinja2.spec b/python-jinja2.spec
index 0c96f31..0f4dec0 100644
--- a/python-jinja2.spec
+++ b/python-jinja2.spec
@@ -6,11 +6,11 @@
 
 # Enable building without docs to avoid a circular dependency between this
 # and python-sphinx:
-%global with_docs 0
+%global with_docs 1
 
 Name:		python-jinja2
 Version:	2.5.5
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	General purpose template engine
 Group:		Development/Languages
 License:	BSD
@@ -32,10 +32,6 @@ BuildRequires:	python3-setuptools
 BuildRequires:	python3-markupsafe
 %endif # with_python3
 
-%if 0%{?fedora} < 13
-BuildRequires:	python-setuptools-devel
-%endif 
-
 
 %description
 Jinja2 is a template engine written in pure Python.  It provides a
@@ -127,7 +123,7 @@ make test
 
 %if 0%{?with_python3}
 pushd %{py3dir}
-make test || :
+make test
 popd
 %endif # with_python3
 
@@ -159,6 +155,11 @@ popd
 
 
 %changelog
+* Tue Jan 18 2011 Thomas Moschny <thomas.moschny@gmx.de> - 2.5.5-3
+- Re-enable html doc generation.
+- Remove conditional for F-12 and below.
+- Do not silently fail the testsuite for with py3k.
+
 * Mon Nov  1 2010 Michel Salim <salimma@fedoraproject.org> - 2.5.5-2
 - Move python3 runtime requirements to python3 subpackage