diff --git a/.cvsignore b/.cvsignore
index a0ce85a..4c18009 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-phasex-0.11.1.tar.gz
+phasex-0.12.0beta4.tar.gz
diff --git a/phasex.spec b/phasex.spec
index ef112cb..258338b 100644
--- a/phasex.spec
+++ b/phasex.spec
@@ -1,20 +1,22 @@
-%define  desktop_vendor fedora
+%global  desktop_vendor fedora
+%global prerel beta4
 
 Name:  phasex
-Version: 0.11.1
-Release: 8%{?dist}
+Version: 0.12.0
+Release: 0.1.beta4%{?dist}
 Summary: PHASEX -- Phase Harmonic Advanced Synthesis EXperiment
 Group:  Applications/Multimedia
 License: GPLv2
 URL:  http://sysex.net/phasex/
 
-Source0: http://sysex.net/phasex/%{name}-%{version}.tar.gz
-Patch0: %{name}-0.11.1-cflags.patch
+Source0: http://sysex.net/phasex/%{name}-%{version}%{?prerel}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: glibc-devel >= 2.3.0
 BuildRequires: alsa-lib-devel >= 0.9.0
 BuildRequires: jack-audio-connection-kit-devel >= 0.99.0
+BuildRequires: libICE-devel
+BuildRequires: libsamplerate-devel >= 0.1.2
 BuildRequires: gtk2-devel >= 2.4.0
 BuildRequires: perl
 BuildRequires: desktop-file-utils
@@ -34,10 +36,17 @@ processing capabilities, and more.
 
 %prep
 %setup -q
-%patch0 -p1
+
+# Fix optflags
+sed -i -e 's|-O3.*"|%{optflags}"|' -e 's|-mtune=generic||' configure
+
 
 %build
-%configure --disable-dependency-tracking
+%configure \
+%ifarch %ix86 x86_64
+    --enable-arch=%{_target_cpu}
+%endif
+
 make %{?_smp_mflags}
 
 %install
@@ -51,7 +60,7 @@ for s in 16 22 32 48 ; do
 done
 
 BASE="AudioVideo Audio"
-XTRA="X-MIDI X-Digital_Processing X-Jack"
+XTRA="X-MIDI X-Digital_Processing X-Jack X-Synthesis Midi"
 
 %{__mkdir} -p %{buildroot}%{_datadir}/applications
 desktop-file-install --vendor %{desktop_vendor} \
@@ -62,17 +71,17 @@ desktop-file-install --vendor %{desktop_vendor} \
 rm $RPM_BUILD_ROOT%{_datadir}/phasex/phasex.desktop
 
 %post
-touch --no-create %{_datadir}/icons/hicolor || :
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor || :
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+if [ $1 -eq 0 ] ; then
+    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 fi
 
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -85,15 +94,24 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_datadir}/phasex/pixmaps
 %dir %{_datadir}/phasex/sys-midimaps
 %dir %{_datadir}/phasex/sys-patches
+%dir %{_datadir}/phasex/sys-samples
 %{_datadir}/phasex/patchbank
 %{_datadir}/phasex/help/*
 %{_datadir}/phasex/pixmaps/*
 %{_datadir}/phasex/sys-midimaps/*
 %{_datadir}/phasex/sys-patches/*
+%{_datadir}/phasex/sys-samples/*
+%{_datadir}/themes/*
 %{_datadir}/applications/%{desktop_vendor}-phasex.desktop
 %{_datadir}/icons/hicolor/*/apps/phasex-icon.png
 
 %changelog
+* Wed Sep 23 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.12.0-0.1.beta4
+- Fix optflags (RHBZ#499914)
+- Update to 0.12.0beta4 (fixes segfault)
+- Update desktop file according to F-12 FedoraStudio feature
+- Update scriptlets
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.11.1-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
diff --git a/sources b/sources
index 3ef58ea..c4a5c6a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-27109ee65fe21bac1530518b436aa8b3  phasex-0.11.1.tar.gz
+e412fa8ce8f310968e40afffde9e2335  phasex-0.12.0beta4.tar.gz