diff --git a/baselibs.conf b/baselibs.conf
new file mode 100644
index 0000000..c557186
--- /dev/null
+++ b/baselibs.conf
@@ -0,0 +1 @@
+libenchant1
diff --git a/enchant.changes b/enchant.changes
index 76b166c..1e41d40 100644
--- a/enchant.changes
+++ b/enchant.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Wed Aug 25 10:50:53 CEST 2010 - vuntz@opensuse.org
+
+- Move the files needed by the library to the libenchant1
+  subpackage, and create a tools subpackage. The enchant package is
+  provided/obsoleted by libenchant1.
+
+-------------------------------------------------------------------
+Fri Jun  4 12:50:32 UTC 2010 - coolo@novell.com
+
+- add baselibs.conf
+
 -------------------------------------------------------------------
 Fri Apr  2 19:11:59 CEST 2010 - vuntz@opensuse.org
 
diff --git a/enchant.spec b/enchant.spec
index 045e3bf..5569943 100644
--- a/enchant.spec
+++ b/enchant.spec
@@ -20,12 +20,13 @@
 
 Name:           enchant
 Version:        1.6.0
-Release:        1
+Release:        2
 License:        LGPLv2.1+
 Summary:        Generic Spell Checking Library
 Group:          Productivity/Text/Spell
 Url:            http://www.abisource.com/
 Source:         %{name}-%{version}.tar.bz2
+Source1:        baselibs.conf
 BuildRequires:  aspell-devel
 BuildRequires:  dbus-1-glib-devel
 BuildRequires:  gcc-c++
@@ -38,6 +39,17 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 A library providing an efficient extensible abstraction for dealing
 with different spell checking libraries.
 
+%package tools
+License:        LGPLv2.1+
+Summary:        Generic Spell Checking Library - Command Line Tools
+Group:          Productivity/Text/Spell
+
+%description tools
+A library providing an efficient extensible abstraction for dealing
+with different spell checking libraries.
+
+This package provides command-line tools to interact with enchant.
+
 %package voikko
 License:        LGPLv2.1+
 Summary:        Generic Spell Checking Library - Voikko Plugin
@@ -69,7 +81,8 @@ different spell checking libraries.
 License:        LGPLv2.1+
 Summary:        Generic Spell Checking Library
 Group:          System/Libraries
-Requires:       %{name} = %{version}
+Provides:       %{name} = %{version}
+Obsoletes:      %{name} < %{version}
 
 %description -n libenchant1
 A library providing an efficient extensible abstraction for dealing
@@ -107,18 +120,11 @@ rm -rf %{buildroot}
 
 %postun -n libenchant1 -p /sbin/ldconfig
 
-%files
+%files tools
 %defattr(-,root,root)
-# AUTHORS == MAINTAINERS in 1.3.0, TODO is 1 byte, BUGS has nothing interesting
-%doc AUTHORS COPYING.LIB ChangeLog NEWS README
-%defattr (-, root, root)
-%{_bindir}/*
-%{_datadir}/enchant
-%dir %{_libdir}/enchant
-%{_libdir}/enchant/libenchant_aspell.so
-%{_libdir}/enchant/libenchant_ispell.so
-%{_libdir}/enchant/libenchant_myspell.so
-%doc %{_mandir}/man?/*.*
+%{_bindir}/enchant
+%{_bindir}/enchant-lsmod
+%doc %{_mandir}/man1/enchant.1*
 
 %files voikko
 %defattr(-,root,root)
@@ -130,7 +136,15 @@ rm -rf %{buildroot}
 
 %files -n libenchant1
 %defattr(-,root,root)
+# AUTHORS == MAINTAINERS in 1.3.0, TODO is 1 byte, BUGS has nothing interesting
+%doc AUTHORS COPYING.LIB ChangeLog NEWS README
 %{_libdir}/*.so.*
+# The directories are not versioned, unfortunately. Not good for the SLPP.
+%{_datadir}/enchant
+%dir %{_libdir}/enchant
+%{_libdir}/enchant/libenchant_aspell.so
+%{_libdir}/enchant/libenchant_ispell.so
+%{_libdir}/enchant/libenchant_myspell.so
 
 %files devel
 %defattr(-,root,root)