diff --git a/.cvsignore b/.cvsignore
index 9d5a2ab..e38f521 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,3 +1,4 @@
 kdemultimedia-3.5.7.tar.bz2
 kdemultimedia-3.5.7-patched.tar.bz2
 kdemultimedia-3.5.7-patched-2.tar.bz2
+kdemultimedia-3.5.8-patched.tar.bz2
diff --git a/kdemultimedia.spec b/kdemultimedia.spec
index 07602d3..3942b57 100644
--- a/kdemultimedia.spec
+++ b/kdemultimedia.spec
@@ -20,14 +20,14 @@
 Name:    kdemultimedia
 Summary: Multimedia applications for the K Desktop Environment (KDE)
 Epoch:   6
-Version: 3.5.7
-Release: 2%{?dist}
+Version: 3.5.8
+Release: 1%{?dist}
 
-License: GPLv2+
+License: GPLv2
 Group:   Applications/Multimedia
 Url:     http://www.kde.org
 
-%define patch patched-2
+%define patch patched
 %define nonfree_bits mpeglib mpeglib_artsplugin mpg123_artsplugin
 ## To generate -patched tarball,
 # 1. tar xjf kdemultimedia-%{version}
@@ -47,6 +47,7 @@ Patch4: kdemultimedia-3.5.3-examples.patch
 # upstream patches
 Patch100: kdemultimedia-3.5.3-noatun.patch
 
+Requires: %{name}-libs = %{epoch}:%{version}-%{release}
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 
@@ -71,7 +72,7 @@ BuildRequires: automake libtool
 
 %description
 The K Desktop Environment (KDE) is a GUI desktop for the X Window
-System. The kdemultimedia package contains multimedia applications for
+System. The %{name} package contains multimedia applications for
 KDE, including:
   kmid, a midi player
   kmix, an audio mixer
@@ -81,29 +82,46 @@ KDE, including:
   kaudiocreator, a graphical frontend for audio file creation 
 
 %package devel
-Summary: Development files for aRts plugins
+Summary: Development files for %{name}, aRts and noatun plugins
 Group: Development/Libraries
 Provides: kdemultimedia3-devel = %{version}-%{release}
-Requires: %{name} = %{epoch}:%{version}-%{release}
+Requires: %{name}-libs = %{epoch}:%{version}-%{release}
 # for noatun shlib(s)
-Requires: %{name}-extras = %{epoch}:%{version}-%{release}
-Requires: kdelibs-devel
+Requires: %{name}-extras-libs = %{epoch}:%{version}-%{release}
+Requires: kdelibs3-devel
 %description devel
-Development files for aRts and noatun plugins.
-Install kdemultimedia-devel if you wish to develop or compile any
+{summary}.
+Install %{name}-devel if you wish to develop or compile any
 applications using aRtsbuilder, aRtsmidi, aRtskde, aRts modules or
 noatun plugins.
 
 %package extras
-Summary: Extras packages from kdemultimedia
+Summary: Extra applications from %{name} 
 Group: Applications/Multimedia
-Requires: %{name} = %{epoch}:%{version}-%{release}
+Requires: %{name}-extras-libs = %{epoch}:%{version}-%{release}
 %description extras
-More multimedia applications for the K Desktop Environment:
+%{summary}, including:
  * juk, a media player
  * kaboodle, a media player
  * noatun, a media player
 
+%package extras-libs
+Summary: Extra %{name} runtime libraries 
+Group: System Environment/Libraries 
+Requires: %{name}-libs = %{epoch}:%{version}-%{release}
+%description extras-libs
+%{summary}.
+
+%package libs
+Summary: %{name} runtime libraries
+Group:   System Environment/Libraries
+Requires: kdelibs3 >= %{version}
+# include to be paranoid, installing libs-only is still mostly untested -- Rex
+#Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+%description libs
+%{summary}.
+
+
 %prep
 %setup -q -n %{name}-%{version}-%{patch}
 
@@ -154,7 +172,11 @@ export DO_NOT_COMPILE="$DO_NOT_COMPILE %{nonfree_bits}"
   %{?_with_taglib} %{!?_with_taglib:--without-taglib} \
   %{?_with_xine} %{!?_with_xine:--without-xine}
 
-make %{?_smp_mflags}
+# FIXME: See http://bugzilla.redhat.com/330971
+make %{?_smp_mflags} -k || \
+  sed -i -e "s|-Wp,-D_FORTIFY_SOURCE=2||" noatun/modules/artseffects/Makefile && \
+  make %{?_smp_mflags}
+
 make %{?_smp_mflags} -C kaudiocreator
 
 
@@ -263,12 +285,8 @@ rm -rf %{buildroot}
 %{_libdir}/kconf_update_bin/noatun20update
 %{_libdir}/kde3/noatun*
 %{_libdir}/libartseffects.*
-%{_libdir}/libkdeinit_noatun.*
-%{_libdir}/libnoatunarts.*
-%{_libdir}/libnoatuncontrols.*
-%{_libdir}/libnoatun.*
-%{_libdir}/libnoatuntags.*
 %{_libdir}/libwinskinvis.*
+%{_libdir}/libkdeinit_noatun.*
 %{_datadir}/applications/kde/noatun.desktop
 %{_datadir}/apps/kconf_update/noatun.upd
 %{_datadir}/apps/noatun/
@@ -284,9 +302,14 @@ rm -rf %{buildroot}
 %{_datadir}/icons/crystalsvg/*/*/juk*
 %{_datadir}/icons/hicolor/*/apps/juk.png
 
+%files extras-libs
+%{_libdir}/libnoatuncontrols.so.*
+%{_libdir}/libnoatun.so.*
+%{_libdir}/libnoatuntags.so.*
+
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc COPYING COPYING-DOCS
+%doc COPYING
 
 # kaboodle
 %exclude %{_docdir}/HTML/en/kaboodle/
@@ -326,7 +349,7 @@ rm -rf %{buildroot}
 
 /etc/xdg/menus/applications-merged/*
 %{_libdir}/mcop/*
-%{_libdir}/*.la
+%{_libdir}/lib*.la
 %{_libdir}/libkdeinit_*.so
 %{_libdir}/lib*.so.*
 %{_libdir}/liboggarts.so
@@ -348,18 +371,28 @@ rm -rf %{buildroot}
 %files devel
 %defattr(-,root,root,-)
 %{_includedir}/kde/*
-%{_libdir}/*.so
+%{_libdir}/lib*.so
 %exclude %{_libdir}/libkdeinit_*
 %exclude %{_libdir}/libartseffects.so
 %exclude %{_libdir}/libnoatunarts.so
 %exclude %{_libdir}/liboggarts.so
 %exclude %{_libdir}/libwinskinvis.so
 
+%files libs
+%defattr(-,root,root,-)
+%{_libdir}/lib*.so.*
+%{_libdir}/lib*.la
+%exclude %{_libdir}/libnoatun*.so.*
+
 
 %changelog
+* Sat Oct 13 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.8-1
+- kde-3.5.8
+- -libs, -extras-libs subpkg (more multilib friendly)
+
 * Mon Aug 13 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.7-2
-- (re)include kfile_mp3, kfile_mpeg, which includes metadata support only
-  (not nonfree decoders).
+- (re)include kfile_mp3, kfile_mpeg, providing (konq) meta-info support
+  (not nonfree decoders)
 - License: GPLv2+
 - Provides: kdemultimedia3(-devel) ...
 
diff --git a/sources b/sources
index 0112de9..4287568 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-087610cce1f0b3f5ea9fbdb3b8120377  kdemultimedia-3.5.7-patched-2.tar.bz2
+09451109c854e34ba237d8d267f7bbd2  kdemultimedia-3.5.8-patched.tar.bz2