diff --git a/vlc.changes b/vlc.changes
index c2a8673..09e08ee 100644
--- a/vlc.changes
+++ b/vlc.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Thu Oct  9 18:37:20 UTC 2014 - vindex17@outlook.it
+
+- Enable SSE2 instruction set for x86_64
+
+-------------------------------------------------------------------
+Tue Oct  7 00:44:05 UTC 2014 - dimstar@opensuse.org
+
+- Disable fluidsynth again: the crashes we had earlier are still
+  not all fixed. They are less, but less common makes it more
+  difficult to debug.
+
 -------------------------------------------------------------------
 Sun Oct  5 12:54:44 UTC 2014 - olaf@aepfle.de
 
diff --git a/vlc.spec b/vlc.spec
index 5b4597f..62437df 100644
--- a/vlc.spec
+++ b/vlc.spec
@@ -24,6 +24,9 @@
 # Currently no ncurses support. Will have to find the right trick for integrating curses (which is a curse)
 %define with_ncurses 0
 
+# Fluidsynth plugin is known to cause strange crashes here and there - disable it for now (2014-10-07, DimStar)
+%bcond_with fluidsynth
+
 %ifarch %arm
 %bcond_without opengles
 %else
@@ -46,7 +49,9 @@ BuildRequires:  alsa-devel >= 1.0.24
 BuildRequires:  avahi-devel
 BuildRequires:  fdupes
 BuildRequires:  flac-devel
+%if %{with fluidsynth}
 BuildRequires:  fluidsynth-devel
+%endif
 %if 0%{?suse_version} >= 1220
 BuildRequires:  freerdp-devel
 %endif
@@ -276,13 +281,18 @@ sed -e "s/__DATE__/\"$FAKE_BUILDDATE\"/" -i modules/gui/qt4/dialogs/help.cpp src
 
 %build 
 pkg-config --exists smbclient && smbclient=$(pkg-config --cflags smbclient)
-%ifarch %{ix86} x86_64
+%ifarch %{ix86}
 export CFLAGS="%{optflags} -L%{_libdir}/live -msse -Wno-return-type $smbclient"
 export CXXFLAGS="%{optflags} -L%{_libdir}/live -msse -Wno-return-type $smbclient"
 %else
+%ifarch x86_64
+export CFLAGS="%{optflags} -L%{_libdir}/live -msse2 -Wno-return-type $smbclient"
+export CXXFLAGS="%{optflags} -L%{_libdir}/live -msse2 -Wno-return-type $smbclient"
+%else
 export CFLAGS="%{optflags} -L%{_libdir}/live -Wno-return-type $smbclient"
 export CXXFLAGS="%{optflags} -L%{_libdir}/live -Wno-return-type $smbclient"
 %endif
+%endif
 
 %configure \
    --disable-static                     \
@@ -664,7 +674,9 @@ done
 %{_libdir}/vlc/plugins/codec/libdvbsub_plugin.so
 %{_libdir}/vlc/plugins/codec/libedummy_plugin.so
 %{_libdir}/vlc/plugins/codec/libflac_plugin.so
+%if %{with fluidsynth}
 %{_libdir}/vlc/plugins/codec/libfluidsynth_plugin.so
+%endif
 %{_libdir}/vlc/plugins/codec/libg711_plugin.so
 %{_libdir}/vlc/plugins/codec/libkate_plugin.so
 %{_libdir}/vlc/plugins/codec/liblpcm_plugin.so