diff --git a/libcdr.changes b/libcdr.changes
index 3ad555d..a307d69 100644
--- a/libcdr.changes
+++ b/libcdr.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sat Jan 25 21:27:54 UTC 2014 - tchvatal@suse.com
+
+- Format with spec-cleaner and noarch documentation.
+
 -------------------------------------------------------------------
 Sat Jan 18 15:31:13 UTC 2014 - crrodriguez@opensuse.org
 
diff --git a/libcdr.spec b/libcdr.spec
index 89d5c2b..6578dcc 100644
--- a/libcdr.spec
+++ b/libcdr.spec
@@ -16,7 +16,16 @@
 #
 
 
+%define libname libcdr-0_0-0
 Name:           libcdr
+Version:        0.0.14
+Release:        0
+Summary:        Library for parsing the Corel Draw file format structure
+License:        LGPL-2.0+ or GPL-2.0+ or MPL-1.1
+Group:          Productivity/Publishing/Word
+Url:            http://www.freedesktop.org/wiki/Software/libcdr
+Source0:        http://dev-www.libreoffice.org/src/libcdr-%{version}.tar.xz
+Patch0:         libcdr-0.0.14-wpx_seek_end.patch
 # note: the main package is empty, it only sets a sane name for the source rpm
 BuildRequires:  boost-devel
 BuildRequires:  doxygen
@@ -28,35 +37,24 @@ BuildRequires:  libwpg-devel >= 0.2.0
 BuildRequires:  pkgconfig
 BuildRequires:  xz
 BuildRequires:  zlib-devel
-Summary:        Library for parsing the Corel Draw file format structure
-License:        LGPL-2.0+ or GPL-2.0+ or MPL-1.1
-Group:          Productivity/Publishing/Word
-Version:        0.0.14
-Release:        0
-Url:            http://www.freedesktop.org/wiki/Software/libcdr
-Source0:        http://dev-www.libreoffice.org/src/libcdr-%{version}.tar.xz
-Patch0:         libcdr-0.0.14-wpx_seek_end.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
 libcdr is a library for parsing the Corel Draw file format structure. It is
 cross-platform, at the moment it can be build on Microsoft Windows and Linux.
 
-
-%define libname libcdr-0_0-0
-%package -n %libname
+%package -n %{libname}
 Summary:        Library for parsing the Corel Draw file format structure
 Group:          System/Libraries
 
-%description -n %libname
+%description -n %{libname}
 libcdr is a library for parsing the Corel Draw file format structure. It is
 cross-platform, at the moment it can be build on Microsoft Windows and Linux.
 
-
 %package devel
 Summary:        Files for Developing with libcdr
 Group:          Development/Libraries/C and C++
-Requires:       %libname = %version
+Requires:       %{libname} = %{version}
 Requires:       libwpd-devel
 Requires:       libwpg-devel
 
@@ -66,10 +64,12 @@ cross-platform, at the moment it can be build on Microsoft Windows and Linux.
 
 This package contains the libcdr development files.
 
-
 %package devel-doc
 Summary:        Documentation for the libcdr API
 Group:          Documentation/HTML
+%if 0%{?suse_version} > 1200
+BuildArch:      noarch
+%endif
 
 %description devel-doc
 This package contains documentation for the libcdr API.
@@ -81,28 +81,27 @@ Group:          Productivity/Publishing/Word
 %description tools
 Tools to work with documents in Corel Draw file-format.
 
-
 %prep
 %setup -q
 %patch0 -p1 -b .wpx_seek_end
 
 %build
-export CXXFLAGS="%optflags -fvisibility-inlines-hidden"
-%configure --disable-werror --disable-static --docdir=%_docdir/%name
+export CXXFLAGS="%{optflags} -fvisibility-inlines-hidden"
+%configure --disable-werror --disable-static --docdir=%{_docdir}/%{name}
 make %{?_smp_mflags} V=1
 
 %install
-make DESTDIR=%{buildroot} install
-rm %{buildroot}%_libdir/*.la
+make DESTDIR=%{buildroot} install %{?_smp_mflags}
+find %{buildroot} -type f -name "*.la" -delete -print
 # documentation
 mkdir -p %{buildroot}%{_docdir}/%{name}
 cp -p AUTHORS COPYING.* ChangeLog %{buildroot}%{_docdir}/%{name}
 
-%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.*