diff --git a/.cvsignore b/.cvsignore
index 6a30f35..cab3b0b 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-guitarix-0.08.0.tar.bz2
+guitarix-0.09.0.tar.bz2
diff --git a/guitarix.spec b/guitarix.spec
index 28a7e11..96a407b 100644
--- a/guitarix.spec
+++ b/guitarix.spec
@@ -1,5 +1,5 @@
 Name:           guitarix
-Version:        0.08.0
+Version:        0.09.0
 Release:        1%{?dist}
 Summary:        Mono amplifier to JACK
 Group:          Applications/Multimedia
@@ -22,7 +22,7 @@ BuildRequires:  zita-resampler-devel
 
 Requires:       jack_capture
 Requires:       jconv
-Requires:       ladspa
+Requires:       ladspa-%{name}-plugins = %{version}-%{release}
 Requires:       qjackctl
 Requires:       vorbis-tools
 
@@ -40,20 +40,47 @@ the sound 'pressure', you can use the feedback and feedforward sliders.
 Guitarix includes an experimental tuner and a JACK MIDI output port with 3
 channels. They are fed by a mix from a pitch tracker and a beat detector. You
 can pitch the octave (2 octaves up or down), choose the MIDI channel, the MIDI
-program, the velocity and the sensitiviy, which translates into how fast the
+program, the velocity and the sensitivity, which translates into how fast the
 note will read after the beat detector emits a signal. Values for the beat
 detector can be set for all channels.
 
+%package -n ladspa-%{name}-plugins
+Summary:        Collection of Ladspa plug-ins
+Group:          Applications/Multimedia
+# ladspa/distortion.cpp and ladspa/guitarix-ladspa.cpp are BSD
+# The rest of ladspa/* is GPLv+
+License:        GPL+ and BSD
+Requires:       ladspa
+
+%description -n ladspa-%{name}-plugins
+This package contains the crybaby, distortion, echo, impulseresponse, monoamp,
+and monocompressor ladspa plug-ins that come together with guitarix, but can
+also be used by any other ladspa host.
 
 %prep
 %setup -q
 
+# The build system does not use these bundled libraries by default. But
+# just to make sure:
+rm -fr src/zita-convolver src/zita-resampler
+
 # Fix build flags
 sed -i 's|-O3 ||' wscript
 
+
 %build
-./waf -vv configure --prefix=%{_prefix}   \
-      --cxxflags="%{optflags} -std=c++0x" \
+./waf -vv configure --prefix=%{_prefix}                                      \
+      --cxxflags="-std=c++0x -fomit-frame-pointer -ftree-loop-linear         \
+      -ffinite-math-only -fno-math-errno -fno-signed-zeros -fstrength-reduce \
+%ifarch %ix86 x86_64
+      -mmmx -mfpmath=sse                                                     \
+%ifarch %ix86
+      -msse                                                                  \
+%else
+      -msse2                                                                 \
+%endif
+%endif
+      %{optflags}"                                                           \
       --ladspadir=%{_libdir}/ladspa
 ./waf -vv build %{?_smp_mflags}
 
@@ -76,12 +103,20 @@ rm -rf %{buildroot}
 %doc changelog COPYING README
 %{_bindir}/%{name}
 %{_datadir}/%{name}/
-%{_libdir}/ladspa/*.so
 %{_datadir}/ladspa/rdf/%{name}.rdf
 %{_datadir}/pixmaps/*
 %{_datadir}/applications/%{name}.desktop
 
+%files -n ladspa-%{name}-plugins
+%defattr(-,root,root,-)
+%{_libdir}/ladspa/*.so
+
 %changelog
+* Sat Jun 26 2010 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.09.0-1
+- Update to 0.09.0
+- Split the ladspa plugins into a separate package as they can also be used by
+  other hosts than guitarix.
+
 * Sat May 15 2010 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.08.0-1
 - Update to 0.08.0
 
diff --git a/sources b/sources
index 4cbdbb8..e1df118 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ad257958d68535bce388741c7219fbf9  guitarix-0.08.0.tar.bz2
+39b792cbb2fedc0efdd474d7a6cd6898  guitarix-0.09.0.tar.bz2