diff --git a/waf.spec b/waf.spec
index 53beef0..3b97594 100644
--- a/waf.spec
+++ b/waf.spec
@@ -1,17 +1,16 @@
 %if (! 0%{?rhel}) || 0%{?rhel} > 6
 %global with_python3 1
+# Turn off the brp-python-bytecompile script
+%global __os_install_post %(echo '%{__os_install_post}' | sed -e 's!/usr/lib[^[:space:]]*/brp-python-bytecompile[[:space:]].*$!!g')
 %endif
 
 # Enable building without html docs (e.g. in case no recent sphinx is
 # available)
 %global with_docs 1
 
-# Turn off the brp-python-bytecompile script
-%global __os_install_post %(echo '%{__os_install_post}' | sed -e 's!/usr/lib[^[:space:]]*/brp-python-bytecompile[[:space:]].*$!!g')
-
 Name:           waf
 Version:        1.6.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A Python-based build system
 Group:          Development/Tools
 # The entire source code is BSD apart from pproc.py (taken from Python 2.5)
@@ -31,7 +30,11 @@ BuildRequires:  python-devel
 BuildRequires:  python3-devel
 %endif # with_python3
 %if 0%{?with_docs}
+%if 0%{?fedora > 13}
 BuildRequires:  python-sphinx
+%else
+BuildRequires:  python-sphinx10
+%endif
 BuildRequires:  graphviz
 BuildRequires:  ImageMagick
 %endif # with_docs
@@ -70,6 +73,9 @@ done
 %if 0%{?with_docs}
 # build html docs
 pushd docs/sphinx
+%if ! 0%{?fedora > 13}
+export SPHINX_BUILD=sphinx-1.0-build
+%endif
 ../../waf configure build
 popd
 %endif # with_docs
@@ -109,9 +115,9 @@ find demos utils -type f -exec %{__chmod} 0644 {} \;
 # remove hidden file
 rm -f docs/sphinx/build/html/.buildinfo
 
+%if 0%{?with_python3}
 # do byte compilation
 %py_byte_compile %{__python} %{buildroot}%{_datadir}/waf
-%if 0%{?with_python3}
 %py_byte_compile %{__python3} %{buildroot}%{_datadir}/waf3
 %endif # with_python3
 
@@ -134,6 +140,11 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sat Apr  9 2011 Thomas Moschny <thomas.moschny@gmx.de> - 1.6.3-2
+- Use python-sphinx10 where available.
+- Turn off standard brp-python-bytecompile only when building the
+  python3 subpackage.
+
 * Sat Feb 19 2011 Thomas Moschny <thomas.moschny@gmx.de> - 1.6.3-1
 - Update to 1.6.3.