diff --git a/.gitignore b/.gitignore
index 0119e41..602add8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/libwps-0.2.9.tar.xz
+SOURCES/libwps-0.3.1.tar.xz
diff --git a/.libwps.metadata b/.libwps.metadata
index c7d4f6c..b55057d 100644
--- a/.libwps.metadata
+++ b/.libwps.metadata
@@ -1 +1 @@
-a7892c56d40043a6efbb8b1543b2353668d31ccc SOURCES/libwps-0.2.9.tar.xz
+be833c8da3bad8dbfd13ba3aa0137c01ac7ca9ac SOURCES/libwps-0.3.1.tar.xz
diff --git a/SPECS/libwps.spec b/SPECS/libwps.spec
index 7438d85..5adb22b 100644
--- a/SPECS/libwps.spec
+++ b/SPECS/libwps.spec
@@ -1,25 +1,25 @@
-%global apiversion 0.2
+%global apiversion 0.3
 
 Name:		libwps
-Version:	0.2.9
-Release:	8%{?dist}
-Summary:	Library for reading and converting Microsoft Works word processor documents
+Version:	0.3.1
+Release:	1%{?dist}
+Summary:	A library for import of Microsoft Works documents
 
-Group:		System Environment/Libraries
 License:	LGPLv2+ or MPLv2.0
 URL:		http://libwps.sourceforge.net/
 Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.xz
 
 BuildRequires:	boost-devel
 BuildRequires:	doxygen
-BuildRequires:	libwpd-devel
+BuildRequires:	help2man
+BuildRequires:	pkgconfig(librevenge-0.0)
 
 %description
-Library that handles Microsoft Works documents.
+%{name} is a library for import of Microsoft Works text documents,
+spreadsheets and (in a limited way) databases.
 
 %package devel
 Summary:	Development files for %{name}
-Group:		Development/Libraries
 Requires:	%{name}%{?_isa} = %{version}-%{release}
 
 %description devel
@@ -27,17 +27,15 @@ The %{name}-devel package contains libraries and header files for
 developing applications that use %{name}.
 
 %package tools
-Summary:	Tools to transform Works documents into other formats
-Group:		Applications/Publishing
+Summary:	Tools to transform Microsoft Works documents into other formats
 Requires:	%{name}%{?_isa} = %{version}-%{release}
 
 %description tools
-Tools to transform Works documents into other formats.
-Currently supported: html, raw, text
+Tools to transform Microsoft Works documents into other formats.
+Currently supported: CSV, HTML, raw, text
 
 %package doc
 Summary:	Documentation of %{name} API
-Group:		Documentation
 BuildArch:	noarch
 
 %description doc
@@ -45,8 +43,6 @@ The %{name}-doc package contains documentation files for %{name}
 
 %prep
 %setup -q
-# Prevent autotools from being rerun
-touch -r aclocal.m4 configure configure.in
 
 %build
 %configure --disable-silent-rules --disable-static --disable-werror
@@ -54,14 +50,23 @@ 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}
 
+export LD_LIBRARY_PATH=`pwd`/src/lib/.libs${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}
+help2man -N -n 'convert Works spreadsheet into CSV' -o wks2csv.1 ./src/conv/wks2csv/.libs/wks2csv
+help2man -N -n 'debug the conversion library' -o wks2raw.1 ./src/conv/wks2raw/.libs/wks2raw
+help2man -N -n 'convert Works spreadsheet into plain text' -o wks2text.1 ./src/conv/wks2text/.libs/wks2text
+help2man -N -n 'debug the conversion library' -o wps2raw.1 ./src/conv/raw/.libs/wps2raw
+help2man -N -n 'convert Works document into HTML' -o wps2html.1 ./src/conv/html/.libs/wps2html
+help2man -N -n 'convert Works document into plain text' -o wps2text.1 ./src/conv/text/.libs/wps2text
+
 %install
 make install INSTALL="install -p" DESTDIR="%{buildroot}" 
-
-find %{buildroot} -name '*.la' -exec rm -f {} ';'
-
+rm -f %{buildroot}%{_libdir}/*.la
 # we install API docs directly from build
 rm -rf %{buildroot}%{_defaultdocdir}/%{name}
 
+install -m 0755 -d %{buildroot}/%{_mandir}/man1
+install -m 0644 wks2*.1 wps2*.1 %{buildroot}/%{_mandir}/man1
+
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
@@ -76,15 +81,27 @@ rm -rf %{buildroot}%{_defaultdocdir}/%{name}
 %{_libdir}/pkgconfig/%{name}-%{apiversion}.pc
 
 %files tools
+%{_bindir}/wks2csv
+%{_bindir}/wks2raw
+%{_bindir}/wks2text
 %{_bindir}/wps2html
 %{_bindir}/wps2raw
 %{_bindir}/wps2text
+%{_mandir}/man1/wks2csv.1*
+%{_mandir}/man1/wks2raw.1*
+%{_mandir}/man1/wks2text.1*
+%{_mandir}/man1/wps2html.1*
+%{_mandir}/man1/wps2raw.1*
+%{_mandir}/man1/wps2text.1*
 
 %files doc
 %doc COPYING.LGPL COPYING.MPL
 %doc docs/doxygen/html
 
 %changelog
+* Fri Apr 17 2015 David Tardon <dtardon@redhat.com> - 0.3.1-1
+- Resolves: rhbz#1207762 rebase to 0.3.1
+
 * Fri Jan 24 2014 Daniel Mach <dmach@redhat.com> - 0.2.9-8
 - Mass rebuild 2014-01-24