diff --git a/libixion-0_6-0.changes b/libixion.changes
similarity index 87%
rename from libixion-0_6-0.changes
rename to libixion.changes
index e7b191e..a0d63ab 100644
--- a/libixion-0_6-0.changes
+++ b/libixion.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Mar 26 17:11:53 UTC 2013 - tchvatal@suse.com
+
+- Cleanup a bit more for factory inclusion.
+
 -------------------------------------------------------------------
 Tue Mar 26 14:58:20 UTC 2013 - jengelh@inai.de
 
diff --git a/libixion-0_6-0.spec b/libixion.spec
similarity index 64%
rename from libixion-0_6-0.spec
rename to libixion.spec
index 2be1762..4e85c33 100644
--- a/libixion-0_6-0.spec
+++ b/libixion.spec
@@ -16,21 +16,16 @@
 #
 
 
-%define _corename libixion
-%define _ver 0.5.0
-%define _pkgname %{_corename}-%{_ver}
-%define _apiver 0.6
-%define _libname %{_corename}-%{_apiver}
+%define libname libixion-0_6-0
 
-Name:           %{_corename}-0_6-0
-Version:        %{_ver}
+Name:           libixion
+Version:        0.5.0
 Release:        0
 Summary:        Threaded multi-target formula parser & interpreter
 License:        X11
-Group:          Development/Libraries/C and C++
+Group:          Productivity/Publishing/Word
 Url:            http://gitorious.org/ixion
-Source:         %{_pkgname}.tar.bz2
-
+Source:         %{name}-%{version}.tar.bz2
 Patch0:         boost-fix.patch
 BuildRequires:  autoconf >= 2.63
 BuildRequires:  automake
@@ -40,28 +35,47 @@ BuildRequires:  libstdc++-devel
 BuildRequires:  libtool
 BuildRequires:  mdds-devel >= 0.7.1
 BuildRequires:  pkg-config
+BuildRequires:  boost-devel
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
 Ixion is a general purpose formula parser & interpreter that can calculate
 multiple named targets, or "cells".
 
+%package -n %{libname}
+Summary:        Threaded multi-target formula parser & interpreter
+Group:          System/Libraries
+
+%description -n %{libname}
+Ixion is a general purpose formula parser & interpreter that can calculate
+multiple named targets, or "cells".
+
 %package devel
 Summary:        Threaded multi-target formula parser & interpreter
 Group:          Development/Libraries/C and C++
+Requires:       %libname = %version
 
 %description devel
 Ixion is a general purpose formula parser & interpreter that can calculate
 multiple named targets, or "cells".
 
+%package tools
+Summary:        Spreadsheet file processing library
+Group:          Productivity/Publishing/Word
+Requires:       %libname = %version
+
+%description tools
+Tools to use ixion parser and interpreter from cli.
+
 %prep
-%setup -q -n %{_pkgname}
+%setup -q
 %patch0 -p1
 
 %build
 autoreconf -fi
 %configure \
-	--disable-static
+	--disable-static \
+	--docdir=%_docdir/%name
 make %{?_smp_mflags}
 
 %check
@@ -70,21 +84,23 @@ make check
 %install
 make DESTDIR=%{buildroot} install
 rm %{buildroot}%{_bindir}/ixion-test
-rm %{buildroot}%{_libdir}/%{_libname}.la
+rm %{buildroot}%{_libdir}/*.la
 
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
+%post -n %{libname} -p /sbin/ldconfig
+%postun -n %{libname} -p /sbin/ldconfig
 
-%files
+%files -n %{libname}
 %defattr(-,root,root)
-%{_bindir}/ixion-parser
-%{_bindir}/ixion-sorter
-%{_libdir}/%{_libname}.so.*
+%{_libdir}/*.so.*
 
 %files devel
 %defattr(-,root,root)
-%{_includedir}/%{_libname}
-%{_libdir}/%{_libname}.so
-%{_libdir}/pkgconfig/%{_libname}.pc
+%{_includedir}/*
+%{_libdir}/*.so
+%{_libdir}/pkgconfig/*.pc
+
+%files tools
+%defattr(-,root,root)
+%{_bindir}/*
 
 %changelog