diff --git a/python-pylibacl.spec b/python-pylibacl.spec
index b0346a5..8aa0995 100644
--- a/python-pylibacl.spec
+++ b/python-pylibacl.spec
@@ -15,28 +15,24 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-%define prjname pylibacl
-
-Name:           python-%{prjname}
+Name:           python-pylibacl
 Version:	0.5.1
 Release:	0
 License:	LGPL-2.1+
 Summary:	Python POSIX.1e ACL module
 Url:		http://pylibacl.k1024.org/
 Group:		Development/Libraries/Python
-Source:		%{prjname}-%{version}.tar.bz2
+Source:		pylibacl-%{version}.tar.bz2
 BuildRequires:	libacl-devel
 BuildRequires:	python-devel
 BuildRequires:	python-distribute
-BuildRequires:	python-Sphinx
 BuildRequires:  fdupes
+# Documentation requirements:
+BuildRequires:	python-Sphinx
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-
-%if 0%{?suse_version}
-%py_requires
+%if 0%{?suse_version} && 0%{?suse_version} <= 1110
+%{!?python_sitearch: %global python_sitearch %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 %endif
-%{!?python_sitearch: %global python_sitearch %(python -c 
-    "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 %description
 This Python 2.4+ extension module allows you to manipulate the POSIX.1e Access
@@ -54,15 +50,11 @@ Control Lists present in some OS/file-systems combinations. It is a wrapper on
 top of the systems's acl C library - see acl(5).
 
 %prep
-%setup -q -n %{prjname}-%{version}
+%setup -q -n pylibacl-%{version}
 
 %build
-CFLAGS="%{optflags}" python setup.py build
-pushd doc
-mkdir -p ../html _build/doctrees
-sphinx-build -b html -d _build/doctrees . ../html
-rm ../html/.buildinfo
-popd
+CFLAGS="%{optflags} -fno-strict-aliasing" python setup.py build
+python setup.py build_sphinx
 
 %install
 python setup.py install --prefix=%{_prefix} --root=%{buildroot}
@@ -78,7 +70,7 @@ python setup.py test
 
 %files doc
 %defattr(-,root,root)
-%doc html
+%doc build/sphinx/html
 
 %changelog