diff --git a/akode.spec b/akode.spec
index df54e19..3e9cc66 100644
--- a/akode.spec
+++ b/akode.spec
@@ -2,8 +2,9 @@
 Summary: Audio-decoding framework 
 Name:	 akode 
 Version: 2.0.1
-Release: 6%{?dist}
-License: LGPL
+Release: 8%{?dist}
+
+License: LGPLv2+
 Group: 	 System Environment/Libraries
 #URL:	 http://carewolf.com/akode/  
 URL:	 http://www.kde-apps.org/content/show.php?content=30375
@@ -19,13 +20,11 @@ Patch1: akode-pulseaudio.patch
 %define _with_pulseaudio --with-pulseaudio
 %endif
 
-%if 0%{?fedora} > 6
-%define _with_pulseaudio --with-pulseaudio
-# pulseaudio is/will-be the F7 default, 
+%if 0%{?fedora} > 7
+# pulseaudio is/will-be the F8 default
 Requires: %{name}-pulseaudio
 %endif
 
-
 BuildRequires: automake
 BuildRequires: alsa-lib-devel
 BuildRequires: flac-devel
@@ -46,7 +45,6 @@ aKode currently has the following decoder plugins:
 * xiph: Decodes FLAC, Ogg/FLAC, Speex and Ogg Vorbis audio. 
 
 aKode also has the following audio outputs:
-* oss: Outputs to the OSS (Open Sound System)
 * alsa: Outputs to ALSA (dmix is recommended).
 
 %package devel
@@ -63,22 +61,22 @@ Requires: %{name} = %{version}-%{release}
 %description jack 
 %{summary}.
 
-%package libsamplerate 
-Summary: Resampler based on (GPL) libsamplerate for %{name}
+%package pulseaudio
+Summary: Pulseaudio output backend for %{name}
 Group:   Development/Libraries
 Requires: %{name} = %{version}-%{release}
-%description libsamplerate 
+%description pulseaudio
 %{summary}.
-Packaged separately to keep main/core %{akode} package LGPL-clean.
+Recommended for network transparent audio.
 
-%package pulseaudio 
-Summary: Pulseaudio output backend for %{name}
+# Packaged separately to keep main/core %{akode} package LGPL-clean.
+%package libsamplerate 
+Summary: Resampler based on libsamplerate for %{name}
 Group:   Development/Libraries
+License: GPLv2+
 Requires: %{name} = %{version}-%{release}
-%description pulseaudio 
+%description libsamplerate 
 %{summary}.
-Recommended for network transparent audio.
-
 
 
 %prep
@@ -95,6 +93,7 @@ Recommended for network transparent audio.
   --disable-debug --disable-warnings --disable-dependency-tracking \
   --without-libltdl \
   --with-alsa \
+  --without-oss \
   --with-flac \
   %{?_with_jack} %{!?_with_jack:--without-jack} \
   --with-libsamplerate \
@@ -108,12 +107,13 @@ make %{?_smp_mflags}
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot} 
 
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=%{buildroot}
 
 # unpackaged files
-rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la
+rm -f %{buildroot}%{_libdir}/lib*.la
+#rm -f %{buildroot}%{_libdir}/libakode_oss_sink.so
 
 # rpmdocs
 for file in AUTHORS COPYING NEWS README TODO ; do
@@ -122,7 +122,7 @@ done
 
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot} 
 
 
 %post -p /sbin/ldconfig
@@ -136,7 +136,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/akodeplay
 %{_libdir}/libakode.so.*
 %{_libdir}/libakode_alsa_sink.so
-%{_libdir}/libakode_oss_sink.so
 %{_libdir}/libakode_mpc_decoder.so
 %{_libdir}/libakode_xiph_decoder.so
 
@@ -152,25 +151,34 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libakode_jack_sink.so
 %endif
 
-%files libsamplerate
-%defattr(-,root,root,-)
-%{_libdir}/libakode_src_resampler.so
-
 %if "%{?_with_pulseaudio:1}" == "1"
 %files pulseaudio
 %defattr(-,root,root,-)
 %{_libdir}/libakode_polyp_sink.so
 %endif
 
+# License: GPLv2+
+%files libsamplerate
+%defattr(-,root,root,-)
+%{_libdir}/libakode_src_resampler.so
+
 
 
 %changelog
+* Mon Aug 20 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 2.0.1-8
+- -libsamplerate: License: GPLv2+
+- omit oss_sink
+
+* Sat Aug 11 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 2.0.1-7
+- Requires: %%{name}-pulseaudio (f8+)
+- License: LGPLv2+
+
 * Thu Feb 15 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 2.0.1-6
 - respin (for flac, fc7+)
 
 * Mon Feb 12 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 2.0.1-5
 - enable pulseaudio support
-- Requires: akode-pulseaudio (fc7+)
+- Requires: akode-pulseaudio (f7+)
 
 * Thu Dec 14 2006 Rex Dieter <rexdieter[AT]users.sf.net> 2.0.1-4
 - enable jack support (subpkg)