diff --git a/waf-1.6.2-libdir.patch b/waf-1.6.2-libdir.patch
deleted file mode 100644
index 2a50438..0000000
--- a/waf-1.6.2-libdir.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- waf-light.orig	2010-11-25 11:11:50.000000000 +0100
-+++ waf-light	2011-01-15 15:22:53.485315375 +0100
-@@ -145,6 +145,9 @@
- 		w = test(i + '/lib/' + dirname)
- 		if w: return w
- 
-+	w = test('/usr/share/%s' % WAF)
-+	if w: return w
-+
- 	#waf-local
- 	dir = join(base, (sys.platform != 'win32' and '.' or '') + dirname)
- 	w = test(dir)
diff --git a/waf-1.8.11-libdir.patch b/waf-1.8.11-libdir.patch
new file mode 100644
index 0000000..faa88f2
--- /dev/null
+++ b/waf-1.8.11-libdir.patch
@@ -0,0 +1,13 @@
+diff -up waf-1.8.11/waf-light.orig waf-1.8.11/waf-light
+--- waf-1.8.11/waf-light.orig	2015-06-20 22:24:00.000000000 +0200
++++ waf-1.8.11/waf-light	2015-06-22 20:23:07.171667528 +0200
+@@ -149,6 +149,9 @@ def find_lib():
+ 		w = test(i + '/lib/' + dirname)
+ 		if w: return w
+ 
++	w = test('/usr/share/%s' % WAF)
++	if w: return w
++
+ 	#waf-local
+ 	dir = join(base, (sys.platform != 'win32' and '.' or '') + dirname)
+ 	w = test(dir)
diff --git a/waf-1.8.11-sphinx-no-W.patch b/waf-1.8.11-sphinx-no-W.patch
new file mode 100644
index 0000000..a8f3cef
--- /dev/null
+++ b/waf-1.8.11-sphinx-no-W.patch
@@ -0,0 +1,11 @@
+diff -up waf-1.8.11/docs/sphinx/wscript.orig waf-1.8.11/docs/sphinx/wscript
+--- waf-1.8.11/docs/sphinx/wscript.orig	2015-06-11 18:11:04.000000000 +0200
++++ waf-1.8.11/docs/sphinx/wscript	2015-06-22 18:36:02.078701412 +0200
+@@ -19,7 +19,6 @@ def configure(cfg):
+ 	cfg.find_program('convert', var='CONVERT')
+ 	cfg.load('daemon', tooldir=['../../playground/daemon/'])
+ 	cfg.find_program("sphinx-build", var="SPHINX_BUILD")
+-	cfg.env.SPHINX_ARGS = ['-W']
+ 
+ def build(bld):
+ 	bld.path.make_node('_static').mkdir()
diff --git a/waf.spec b/waf.spec
index 0e8f62a..1391091 100644
--- a/waf.spec
+++ b/waf.spec
@@ -14,7 +14,7 @@
 
 Name:           waf
 Version:        1.8.11
-Release:        %{?prerel:0.}1%{?prerel:.%prerel}%{?dist}
+Release:        %{?prerel:0.}2%{?prerel:.%prerel}%{?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)
@@ -27,8 +27,9 @@ URL:            https://github.com/waf-project/waf
 # - docs/book, licensed CC BY-NC-ND
 # - Waf logos, licensed CC BY-NC
 Source:         waf-%{version}%{?prerel}.stripped.tar.bz2
-Patch0:         waf-1.6.2-libdir.patch
+Patch0:         waf-1.8.11-libdir.patch
 Patch1:         waf-1.6.9-logo.patch
+Patch2:         waf-1.8.11-sphinx-no-W.patch
 
 BuildArch:      noarch
 
@@ -105,9 +106,11 @@ This package contains the HTML documentation for %{name}.
 %prep
 %setup -q
 # also search for waflib in /usr/share/waf
-%patch0 -p0
+%patch0 -p1
 # do not try to use the (removed) waf logos
 %patch1 -p1
+# do not add -W when running sphinx-build
+%patch2 -p1
 
 
 %build
@@ -201,6 +204,11 @@ rm -f docs/sphinx/build/html/.buildinfo
 
 
 %changelog
+* Mon Jun 22 2015 Thomas Moschny <thomas.moschny@gmx.de> - 1.8.11-2
+- Patch to remove -W from sphinx-build call, in order to build with
+  older sphinx.
+- Rebase libdir patch.
+
 * Mon Jun 22 2015 Thomas Moschny <thomas.moschny@gmx.de> - 1.8.11-1
 - Update to 1.8.11.