diff --git a/.gitignore b/.gitignore
index 96c436c..c3faaa4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/libwpd-0.9.9.tar.xz
+SOURCES/libwpd-0.10.0.tar.xz
diff --git a/.libwpd.metadata b/.libwpd.metadata
index bc09b3f..58f47a9 100644
--- a/.libwpd.metadata
+++ b/.libwpd.metadata
@@ -1 +1 @@
-1054e1aea54f2b190b97c150bfc39bb9ffe17e90 SOURCES/libwpd-0.9.9.tar.xz
+05aaca47f07954ffe20800a81be643ac329acd77 SOURCES/libwpd-0.10.0.tar.xz
diff --git a/SPECS/libwpd.spec b/SPECS/libwpd.spec
index 293c1bb..85243ab 100644
--- a/SPECS/libwpd.spec
+++ b/SPECS/libwpd.spec
@@ -1,42 +1,38 @@
-%global apiversion 0.9
-%global streamname %{name}-stream
+%global apiversion 0.10
 
 Name: libwpd
-Summary: Library for reading and converting WordPerfect documents
-Version: 0.9.9
-Release: 3%{?dist}
+Summary: A library for import of WordPerfect documents
+Version: 0.10.0
+Release: 1%{?dist}
 Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.xz
-Group: System Environment/Libraries
 URL: http://libwpd.sf.net/
 License: LGPLv2+ or MPLv2.0
 
-BuildRequires: cppunit-devel
 BuildRequires: doxygen
-BuildRequires: zlib-devel
+BuildRequires: help2man
+BuildRequires: pkgconfig(librevenge-0.0)
+BuildRequires: pkgconfig(zlib)
 
 %description
-Library that handles Word Perfect documents.
+%{name} is a library for import of WordPerfect documents.
 
 %package tools
-Summary: Tools to transform WordPerfect Documents into other formats
-Group: Applications/Publishing
+Summary: Tools to transform WordPerfect documents into other formats
 Requires: %{name}%{?_isa} = %{version}-%{release}
 
 %description tools
-Tools to transform WordPerfect Documents into other formats.
+Tools to transform WordPerfect documents into other formats.
 Currently supported: HTML, raw, text.
 
 %package devel
 Requires: %{name}%{?_isa} = %{version}-%{release}
 Summary: Files for developing with libwpd
-Group: Development/Libraries
 
 %description devel
 Includes and definitions for developing with libwpd.
 
 %package doc
 Summary: Documentation of %{name} API
-Group: Documentation
 BuildArch: noarch
 
 %description doc
@@ -48,10 +44,15 @@ The %{name}-doc package contains API documentation for %{name}.
 chmod -x docs/%{name}.dia
 
 %build
-%configure --disable-static --disable-werror
+%configure --disable-static --disable-werror --disable-silent-rules
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
 sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
-make %{?_smp_mflags} V=1
+make %{?_smp_mflags}
+
+export LD_LIBRARY_PATH=`pwd`/src/lib/.libs${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}
+help2man -N -n 'debug the conversion library' -o wpd2raw.1 ./src/conv/raw/.libs/wpd2raw
+help2man -N -n 'convert WordPerfect document into HTML' -o wpd2html.1 ./src/conv/html/.libs/wpd2html
+help2man -N -n 'convert WordPerfect document into plain text' -o wpd2text.1 ./src/conv/text/.libs/wpd2text
 
 %install
 make DESTDIR=$RPM_BUILD_ROOT install
@@ -59,8 +60,8 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
 # we install API docs directly from build
 rm -rf $RPM_BUILD_ROOT/%{_docdir}/%{name}
 
-%check
-LD_LIBRARY_PATH=../lib/.libs make check
+install -m 0755 -d %{buildroot}/%{_mandir}/man1
+install -m 0644 wpd2*.1 %{buildroot}/%{_mandir}/man1
 
 %post -p /sbin/ldconfig
 
@@ -69,19 +70,19 @@ LD_LIBRARY_PATH=../lib/.libs make check
 %files
 %doc COPYING.LGPL COPYING.MPL CREDITS README
 %{_libdir}/%{name}-%{apiversion}.so.*
-%{_libdir}/%{streamname}-%{apiversion}.so.*
 
 %files tools
 %{_bindir}/wpd2html
 %{_bindir}/wpd2raw
 %{_bindir}/wpd2text
+%{_mandir}/man1/wpd2html.1*
+%{_mandir}/man1/wpd2raw.1*
+%{_mandir}/man1/wpd2text.1*
 
 %files devel
 %doc HACKING TODO
 %{_libdir}/%{name}-%{apiversion}.so
-%{_libdir}/%{streamname}-%{apiversion}.so
 %{_libdir}/pkgconfig/%{name}-%{apiversion}.pc
-%{_libdir}/pkgconfig/%{streamname}-%{apiversion}.pc
 %{_includedir}/%{name}-%{apiversion}
 
 %files doc
@@ -91,6 +92,9 @@ LD_LIBRARY_PATH=../lib/.libs make check
 %doc docs/%{name}.png
 
 %changelog
+* Fri Apr 17 2015 David Tardon <dtardon@redhat.com> - 0.10.0-1
+- Resolves: rhbz#1207766 rebase to 0.10.0
+
 * Fri Jan 24 2014 Daniel Mach <dmach@redhat.com> - 0.9.9-3
 - Mass rebuild 2014-01-24