diff --git a/Sphinx-1.0.8-el6-htmltest-fixwarning.patch b/Sphinx-1.0.8-el6-htmltest-fixwarning.patch
new file mode 100644
index 0000000..7f60602
--- /dev/null
+++ b/Sphinx-1.0.8-el6-htmltest-fixwarning.patch
@@ -0,0 +1,11 @@
+--- Sphinx-1.0.8/tests/test_build_html.py.el6-htmltest-fixwarning	2011-09-23 09:43:41.000000000 +0200
++++ Sphinx-1.0.8/tests/test_build_html.py	2011-12-17 15:05:26.948569567 +0100
+@@ -40,7 +40,7 @@
+ %(root)s/includes.txt:\\d*: WARNING: Encoding 'utf-8-sig' used for \
+ reading included file u'.*?wrongenc.inc' seems to be wrong, try giving an \
+ :encoding: option\\n?
+-%(root)s/includes.txt:4: WARNING: download file not readable: nonexisting.png
++None:4: WARNING: download file not readable: nonexisting.png
+ %(root)s/objects.txt:\\d*: WARNING: using old C markup; please migrate to \
+ new-style markup \(e.g. c:function instead of cfunction\), see \
+ http://sphinx.pocoo.org/domains.html
diff --git a/python-sphinx.spec b/python-sphinx.spec
index 472df64..dc4be04 100644
--- a/python-sphinx.spec
+++ b/python-sphinx.spec
@@ -18,6 +18,8 @@ Group:      Development/Tools
 License:    BSD and Public Domain and Python and (MIT or GPLv2)
 URL:        http://sphinx.pocoo.org/
 Source0:    http://pypi.python.org/packages/source/S/%{upstream_name}/%{upstream_name}-%{version}.tar.gz
+# on RHEL6, one of the HTML warnings is slightly different
+Patch0:     %{upstream_name}-1.0.8-el6-htmltest-fixwarning.patch
 
 BuildArch:     noarch
 BuildRequires: python2-devel >= 2.4
@@ -25,6 +27,8 @@ BuildRequires: python-setuptools
 BuildRequires: python-docutils
 BuildRequires: python-jinja2
 BuildRequires: python-nose
+# Test dependencies
+BuildRequires: texlive-latex
 Requires:      python-docutils
 Requires:      python-jinja2
 Requires:      python-pygments
@@ -79,6 +83,9 @@ This package contains documentation in reST and HTML formats.
 
 %prep
 %setup -q -n %{upstream_name}-%{version}%{?prerel}
+%if 0%{?el6}
+%patch0 -p1 -b .el6-htmltest-fixwarning
+%endif
 sed '1d' -i sphinx/pycode/pgen2/token.py
 
 %build
@@ -152,8 +159,9 @@ make test
 
 
 %changelog
-* Thu Dec  8 2011 Michel Salim <salimma@fedoraproject.org> - 1.0.8-1
+* Sat Dec 17 2011 Michel Salim <salimma@fedoraproject.org> - 1.0.8-1
 - Update to upstream 1.0.8
+- BR on texlive-latex for LaTeX tests
 
 * Wed Feb 09 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.7-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild