diff --git a/baselibs.conf b/baselibs.conf
index b9e35ad..a34af3f 100644
--- a/baselibs.conf
+++ b/baselibs.conf
@@ -1,2 +1,2 @@
-speex
-libspeex
+libspeex1
+libspeexdsp1
diff --git a/speex.changes b/speex.changes
index 968f6a3..2c75298 100644
--- a/speex.changes
+++ b/speex.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Thu Jan  7 18:59:26 UTC 2010 - lnussel@suse.de
+
+- split off libspeex1 and libspeexdsp1 according to library
+  packaging policy
+- include actual tarball version in package version
+- don't package README's for embedded cpus
+
 -------------------------------------------------------------------
 Fri Dec 18 13:11:17 CET 2009 - jengelh@medozas.de
 
diff --git a/speex.spec b/speex.spec
index b62417e..6e7e251 100644
--- a/speex.spec
+++ b/speex.spec
@@ -22,9 +22,9 @@ Name:           speex
 %define package_version 1.2rc1
 BuildRequires:  libogg-devel pkgconfig
 Summary:        An Open Source, Patent Free Speech Codec
-Version:        1.1.99.91
-Release:        17
-License:        BSD3c
+Version:        1.1.999_%package_version
+Release:        1
+License:        BSD 3-Clause
 Group:          System/Libraries
 Url:            http://www.speex.org/
 Source:         %{name}-%{package_version}.tar.bz2
@@ -43,49 +43,44 @@ Speex is a patent free audio codec designed especially for voice
 narrowband and wideband quality. This project aims to be complementary
 to the Vorbis codec.
 
-
-
-Authors:
---------
-    Jean-Marc Valin <jean-marc.valin@usherbrooke.ca>
-    David Rowe <david@voicetronix.com.au>
-    John Francis Edwards
-    Segher Boessenkool
-    Atsuhiko Yamanaka <ymnk@jcraft.com>
-    Radim Kolar <hsn@cybermail.net>
-
-%package -n libspeex
+%package -n libspeex1
 Summary:        An Open Source, Patent Free Speech Codec Library
-License:        BSD3c
+License:        BSD 3-Clause
 Group:          System/Libraries
-# bug437293
-%ifarch ppc64
-Obsoletes:      speex-64bit
-%endif
-#
+Obsoletes:      libspeex < %version
+Provides:       libspeex = %version
 
-%description -n libspeex
+%description -n libspeex1
+Speex is a patent free audio codec designed especially for voice
+(unlike Vorbis which targets general audio) signals and providing good
+narrowband and wideband quality. This project aims to be complementary
+to the Vorbis codec.
+
+%package -n libspeexdsp1
+Summary:        An Open Source, Patent Free Speech Codec Library
+License:        BSD 3-Clause
+Group:          System/Libraries
+
+%description -n libspeexdsp1
 Speex is a patent free audio codec designed especially for voice
 (unlike Vorbis which targets general audio) signals and providing good
 narrowband and wideband quality. This project aims to be complementary
 to the Vorbis codec.
 
 
-
-Authors:
---------
-    Jean-Marc Valin <jean-marc.valin@usherbrooke.ca>
-    David Rowe <david@voicetronix.com.au>
-    John Francis Edwards
-    Segher Boessenkool
-    Atsuhiko Yamanaka <ymnk@jcraft.com>
-    Radim Kolar <hsn@cybermail.net>
-
+# XXX: not sure whether to call it libspeex-devel as it includes
+# devel files for libspeexdsp too. having libspeexdsp-devel seems
+# extreme.
 %package devel
 Summary:        Development package for SpeeX
-License:        BSD3c
+License:        BSD 3-Clause
 Group:          Development/Libraries/C and C++
-Requires:       libspeex glibc-devel
+Provides:       libspeex-devel = %version-%release
+Obsoletes:      libspeex-devel < %version-%release
+Requires:       libspeex1 = %version
+Requires:       libspeexdsp1 = %version
+Requires:       glibc-devel
+Requires:       libogg-devel
 # bug437293
 %ifarch ppc64
 Obsoletes:      speex-devel-64bit
@@ -96,17 +91,6 @@ Obsoletes:      speex-devel-64bit
 This package contains the files needed to compile programs that use the
 SpeeX library.
 
-
-
-Authors:
---------
-    Jean-Marc Valin <jean-marc.valin@usherbrooke.ca>
-    David Rowe <david@voicetronix.com.au>
-    John Francis Edwards
-    Segher Boessenkool
-    Atsuhiko Yamanaka <ymnk@jcraft.com>
-    Radim Kolar <hsn@cybermail.net>
-
 %prep
 %setup -q -n %{name}-%{package_version}
 %patch1
@@ -116,18 +100,24 @@ autoreconf -fi
 %configure \
     --disable-static \
     --with-ogg-libraries=%{_libdir}
-make %{?_smp_mflags}
+make %{?jobs:-j%{jobs}}
 
 %install
 %makeinstall
 # remove duped documents
-rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/speex*
+rm -rf %{buildroot}%{_datadir}/doc/speex*
 # remove unneeded *.la files
-rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
+rm -f %{buildroot}%{_libdir}/*.la
+rm -f %{buildroot}%{_libdir}/*.a
 
-%post -n libspeex -p /sbin/ldconfig
 
-%postun -n libspeex -p /sbin/ldconfig
+%post -n libspeex1 -p /sbin/ldconfig
+
+%postun -n libspeex1 -p /sbin/ldconfig
+
+%post -n libspeexdsp1 -p /sbin/ldconfig
+
+%postun -n libspeexdsp1 -p /sbin/ldconfig
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -136,19 +126,22 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root)
 %doc AUTHORS ChangeLog COPYING NEWS README TODO
 %doc doc/*.pdf
-%{_bindir}/*
-%doc %{_mandir}/man?/*
+%{_bindir}/speex*
+%{_mandir}/man?/*
 
-%files -n libspeex
+%files -n libspeex1
 %defattr(-,root,root)
-%{_libdir}/libspeex*.so.*
+%{_libdir}/libspeex.so.*
+
+%files -n libspeexdsp1
+%defattr(-,root,root)
+%{_libdir}/libspeexdsp.so.*
 
 %files devel
 %defattr(-,root,root)
-%doc README.TI-DSP README.blackfin README.symbian
 %doc doc/manual.pdf
 %{_includedir}/*
-%{_libdir}/libspeex*.so
+%{_libdir}/lib*.so
 %{_libdir}/pkgconfig/*.pc
 %{_datadir}/aclocal/*.m4