diff --git a/README.licenses b/README.licenses
index 5d57e56..52123bb 100644
--- a/README.licenses
+++ b/README.licenses
@@ -47,7 +47,7 @@ scrobbler
 scrobbler2                    GPLv3
 sdlout                        BSD
 search-tool                   BSD
-sid
+sid                           GPLv2+
 skins                         GPLv3
 sndfile                       GPLv2+
 sndio
diff --git a/audacious-plugins.spec b/audacious-plugins.spec
index 43c322e..f615286 100644
--- a/audacious-plugins.spec
+++ b/audacious-plugins.spec
@@ -7,11 +7,11 @@
 %global tar_ver 3.4-beta1
 
 # Minimum audacious/audacious-plugins version in inter-package dependencies.
-%global aud_ver 3.4-0.2.beta1
+%global aud_ver 3.4-0.1.beta1
 
 Name: audacious-plugins
 Version: 3.4
-Release: 0.3.beta1%{?dist}
+Release: 0.4.beta1%{?dist}
 Summary: Plugins for the Audacious audio player
 Group: Applications/Multimedia
 URL: http://audacious-media-player.org/
@@ -37,9 +37,7 @@ BuildRequires: alsa-lib-devel
 BuildRequires: pulseaudio-libs-devel
 BuildRequires: libsndfile-devel
 BuildRequires: wavpack-devel
-%if 0%{?fedora} <= 17
-BuildRequires: libsidplay-devel
-%endif
+BuildRequires: libsidplayfp-devel
 BuildRequires: libmodplug-devel
 BuildRequires: libogg-devel libvorbis-devel
 BuildRequires: flac-devel
@@ -66,10 +64,6 @@ BuildRequires: neon-devel
 BuildRequires: automake >= 1.13
 BuildRequires: autoconf >= 2.69
 
-%if 0%{?fedora} > 17
-Obsoletes: audacious-plugins-sid
-%endif
-
 # plugin .so files
 %filter_provides_in %{_libdir}/audacious/
 %filter_setup
@@ -94,15 +88,23 @@ Summary: Optional niche market plugins for Audacious
 Group: Applications/Multimedia
 %{?aud_plugin_dep}
 Requires: audacious-plugins%{?_isa} >= %{aud_ver}
+# last in F17 Updates for Audacious 3.2.4 and based on libsidplay 1.x
+Obsoletes: audacious-plugins-sid < %{version}
+Provides: audacious-plugins-sid = %{version}-%{release}
+# only included the sid.so decoder based on libsidplay 2.x
+Obsoletes: audacious-plugins-nonfree < 3.3.4-2
+Provides: audacious-plugins-nonfree = 3.3.4-2
+
 
 %description exotic
 This package provides optional plugins for Audacious, which do not aim
 at a wide demographic audience. Most users of Audacious do not need this.
 
 For example, included are input plugins for exotic audio file formats,
-AdLib/OPL2 emulation, console game music files, the Portable Sound Format
-PSF1/PSF2, Vortex AM/YM emulation, Game Boy Advance Sound Format GSF,
-Nintendo DS Sound Format 2SF.
+SID music (from Commodore 64 and compatibles), AdLib/OPL2 emulation,
+console game music, the Portable Sound Format PSF1/PSF2, Vortex AM/YM
+emulation, Game Boy Advance Sound Format GSF, Nintendo DS Sound Format
+2SF.
 
 
 %package amidi
@@ -116,20 +118,6 @@ This package provides AMIDI-Plug, a modular MIDI music player, as an
 input plugin for Audacious.
 
 
-%if 0%{?fedora} <= 17
-%package sid
-Summary: Audacious input plugin for SID music files
-Group: Applications/Multimedia
-%{?aud_plugin_dep}
-Requires: audacious-plugins%{?_isa} >= %{aud_ver}
-
-%description sid
-This package provides an Audacious input plugin for SID music files.
-
-This build of the plugin uses libsidplay 1. Third party package
-providers may build it with libsidplay 2 instead.
-%endif
-
 %prep
 %setup -q -n %{name}-%{tar_ver}
 # https://bugzilla.redhat.com/925051
@@ -192,13 +180,11 @@ make install DESTDIR=${RPM_BUILD_ROOT} INSTALL="install -p"
 %exclude %{_libdir}/audacious/Input/adplug.so
 %exclude %{_libdir}/audacious/Input/console.so
 %exclude %{_libdir}/audacious/Input/psf2.so
+%exclude %{_libdir}/audacious/Input/sid.so
 %exclude %{_libdir}/audacious/Input/vtx.so
 %exclude %{_libdir}/audacious/Input/xsf.so
 %exclude %{_libdir}/audacious/Input/amidi-plug.so
 %exclude %{_libdir}/audacious/Input/amidi-plug/
-%if 0%{?fedora} <= 17
-%exclude %{_libdir}/audacious/Input/sid.so
-%endif
 %exclude %{_libdir}/audacious/Output/jackout.so
 
 %files jack
@@ -208,6 +194,7 @@ make install DESTDIR=${RPM_BUILD_ROOT} INSTALL="install -p"
 %{_libdir}/audacious/Input/adplug.so
 %{_libdir}/audacious/Input/console.so
 %{_libdir}/audacious/Input/psf2.so
+%{_libdir}/audacious/Input/sid.so
 %{_libdir}/audacious/Input/vtx.so
 %{_libdir}/audacious/Input/xsf.so
 
@@ -215,13 +202,15 @@ make install DESTDIR=${RPM_BUILD_ROOT} INSTALL="install -p"
 %{_libdir}/audacious/Input/amidi-plug.so
 %{_libdir}/audacious/Input/amidi-plug/
 
-%if 0%{?fedora} <= 17
-%files sid
-%{_libdir}/audacious/Input/sid.so
-%endif
-
 
 %changelog
+* Tue Apr 23 2013 Michael Schwendt <mschwendt@fedoraproject.org> - 3.4-0.4.beta1
+- BR libsidplayfp-devel and include SID music player plug-in in the
+  audacious-plugins-exotic subpackage. This sid.so plugin based on
+  libsidplayfp 1.0.x is extensible with the original (albeit non-free and
+  therefore not included) Kernal and Basic ROM image files to make it
+  handle all files from the leading SID music collection.
+
 * Mon Apr 22 2013 Michael Schwendt <mschwendt@fedoraproject.org> - 3.4-0.3.beta1
 - BR audacious-devel 3.4-beta1 for aud_drct_play_plause().