diff --git a/wayland-1.6.0.tar.xz b/wayland-1.6.0.tar.xz
deleted file mode 100644
index 4b5569d..0000000
--- a/wayland-1.6.0.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a7d5102dcf53d08c059d24bc62de491d7cd482070abeb6737a20d0d86ba6fc7f
-size 415192
diff --git a/wayland-1.6.91.tar.xz b/wayland-1.6.91.tar.xz
new file mode 100644
index 0000000..8ef9cc4
--- /dev/null
+++ b/wayland-1.6.91.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:cb8b4ecdab1e8bba2bd01fc564e4b198c57a82da6f77d5ddaadb0ec73daa5283
+size 427816
diff --git a/wayland.changes b/wayland.changes
index 1b18feb..b630147 100644
--- a/wayland.changes
+++ b/wayland.changes
@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Tue Jan 27 21:19:36 UTC 2015 - jengelh@inai.de
+
+- Update to new upstream prerelease 1.6.91
+* The codebase's doxygen documentation was revamped
+
+-------------------------------------------------------------------
+Sun Jan 25 15:37:03 UTC 2015 - jengelh@inai.de
+
+- Update to new upstream release 1.6.1
+* Maintenance release for Wayland 1.6, with a handful of fixes
+  pulled from the 1.7 tree that improve handling of several error
+  situations between server and clients.
+
 -------------------------------------------------------------------
 Fri Sep 19 20:35:43 UTC 2014 - jengelh@inai.de
 
diff --git a/wayland.spec b/wayland.spec
index 08a0b38..e33021f 100644
--- a/wayland.spec
+++ b/wayland.spec
@@ -18,7 +18,7 @@
 
 %define lname	libwayland0
 Name:           wayland
-Version:        1.6.0
+Version:        1.6.91
 Release:        0
 Summary:        Wayland Compositor Infrastructure
 License:        HPND
@@ -37,7 +37,7 @@ BuildRequires:  fdupes
 BuildRequires:  libxml2-tools
 BuildRequires:  libxslt-tools
 BuildRequires:  pkgconfig
-BuildRequires:  xz
+BuildRequires:  xz xmlto
 BuildRequires:  pkgconfig(expat)
 BuildRequires:  pkgconfig(libffi)
 BuildRoot:      %_tmppath/%name-%version-build
@@ -102,6 +102,14 @@ fullscreen) or other display servers.
 This package contains all necessary include files and libraries needed
 to develop applications that require these.
 
+%package doc
+Summary:        Wayland development documentation
+Group:          Documentation/HTML
+BuildArch:      noarch
+
+%description doc
+This subpackage contains the documentation to Wayland.
+
 %prep
 %setup -q
 
@@ -109,7 +117,8 @@ to develop applications that require these.
 if [ ! -e configure ]; then
 	autoreconf -fi;
 fi;
-%configure --disable-static --includedir="%_includedir/pkg/%name"
+%configure --disable-static --includedir="%_includedir/%name" \
+	--docdir="%_defaultdocdir/%name"
 make %{?_smp_mflags} V=1
 
 %install
@@ -122,7 +131,10 @@ find "%buildroot" -type f -name "*.la" -delete -print
 mkdir xdg
 chmod 700 xdg
 export XDG_RUNTIME_DIR="$PWD/xdg"
-make check %{?_smp_mflags} V=1
+if ! make check %{?_smp_mflags} V=1; then
+	cat test-suite.log
+	exit 1
+fi
 %endif
 
 %post   -n libwayland-client0 -p /sbin/ldconfig
@@ -147,7 +159,7 @@ make check %{?_smp_mflags} V=1
 %files devel
 %defattr(-,root,root)
 %_bindir/wayland-scanner
-%_includedir/pkg/
+%_includedir/%name/
 %_libdir/libwayland-*.so
 %_libdir/pkgconfig/wayland-*.pc
 %_datadir/aclocal/
@@ -155,4 +167,8 @@ make check %{?_smp_mflags} V=1
 %_datadir/wayland/
 %_mandir/man3/wl_*.3*
 
+%files doc
+%defattr(-,root,root)
+%_docdir/wayland/
+
 %changelog