diff --git a/libwpd.changes b/libwpd.changes
index f0cde35..3f0c52c 100644
--- a/libwpd.changes
+++ b/libwpd.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sat Jan 25 20:53:25 UTC 2014 - tchvatal@suse.com
+
+- Cleanup with spec-cleaner and noarch the documentation.
+
 -------------------------------------------------------------------
 Mon Aug 19 14:49:39 UTC 2013 - fstrba@suse.com
 
diff --git a/libwpd.spec b/libwpd.spec
index 7170450..725ac21 100644
--- a/libwpd.spec
+++ b/libwpd.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package libwpd
 #
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,6 +17,13 @@
 
 
 Name:           libwpd
+Version:        0.9.9
+Release:        0
+Summary:        Library for Importing WordPerfect (tm) Documents
+License:        LGPL-2.1+ and MPL-2.0+
+Group:          Productivity/Publishing/Word
+Url:            http://libwpd.sourceforge.net
+Source:         http://downloads.sourceforge.net/project/%{name}/%{name}/%{name}-%{version}/%{name}-%{version}.tar.xz
 # note: the main package is empty, it only sets a sane name for the source rpm
 BuildRequires:  doxygen
 BuildRequires:  fdupes
@@ -24,13 +31,6 @@ BuildRequires:  gcc-c++
 BuildRequires:  pkgconfig
 BuildRequires:  xz
 BuildRequires:  zlib-devel
-Version:        0.9.9
-Release:        0
-Summary:        Library for Importing WordPerfect (tm) Documents
-License:        LGPL-2.1+ and MPL-2.0+
-Group:          Productivity/Publishing/Word
-Source:         http://downloads.sourceforge.net/project/%{name}/%{name}/%{name}-%{version}/%{name}-%{version}.tar.xz
-Url:            http://libwpd.sourceforge.net
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -41,14 +41,14 @@ as an in-process component.
 
 %define libname libwpd-0_9-9
 
-%package -n %libname
-# remove the old non-versioned package (built in the bs for instance)
-Provides:       libwpd = %version
-Obsoletes:      libwpd < %version
+%package -n %{libname}
 Summary:        Library for Importing WordPerfect (tm) Documents
 Group:          System/Libraries
+# remove the old non-versioned package (built in the bs for instance)
+Provides:       libwpd = %{version}
+Obsoletes:      libwpd < %{version}
 
-%description -n %libname
+%description -n %{libname}
 libwpd is a general purpose library for reading or interpreting data
 from WordPerfect files. The library is not a stand-alone utility: it is
 designed to be used by another program (for example, a word processor)
@@ -69,6 +69,9 @@ an in-process component.
 %package devel-doc
 Summary:        Documentation for the libwpd API
 Group:          Documentation/Other
+%if 0%{?suse_version} > 1200
+BuildArch:      noarch
+%endif
 
 %description devel-doc
 This package contains documentation for the libwpd API.
@@ -85,20 +88,20 @@ supported: html, raw, text
 %setup -q
 
 %build
-export CXXFLAGS="%optflags -fvisibility-inlines-hidden"
-%configure --disable-static --docdir=%_docdir/%name
+export CXXFLAGS="%{optflags} -fvisibility-inlines-hidden"
+%configure --disable-static --docdir=%{_docdir}/%{name}
 make %{?_smp_mflags}
 
 %install
-make DESTDIR=$RPM_BUILD_ROOT install
-rm $RPM_BUILD_ROOT%_libdir/*.la
-%fdupes -s $RPM_BUILD_ROOT%{_docdir}/%{name}/html
+make DESTDIR=%{buildroot} install %{?_smp_mflags}
+find %{buildroot} -type f -name "*.la" -delete -print
+%fdupes -s %{buildroot}%{_docdir}/%{name}/html
 
-%post -n %libname -p /sbin/ldconfig
+%post -n %{libname} -p /sbin/ldconfig
 
-%postun -n %libname -p /sbin/ldconfig
+%postun -n %{libname} -p /sbin/ldconfig
 
-%files -n %libname
+%files -n %{libname}
 %defattr(-,root,root)
 %{_libdir}/*.so.*