diff --git a/firefox-baseline-disable.patch b/firefox-baseline-disable.patch
new file mode 100644
index 0000000..806d378
--- /dev/null
+++ b/firefox-baseline-disable.patch
@@ -0,0 +1,13 @@
+diff -up firefox-32.0.1/mozilla-release/media/webrtc/trunk/Makefile.old firefox-32.0.1/mozilla-release/media/webrtc/trunk/Makefile
+diff -up firefox-32.0.1/mozilla-release/modules/libpref/src/init/all.js.old firefox-32.0.1/mozilla-release/modules/libpref/src/init/all.js
+--- firefox-32.0.1/mozilla-release/modules/libpref/src/init/all.js.old	2014-09-12 00:25:45.000000000 +0200
++++ firefox-32.0.1/mozilla-release/modules/libpref/src/init/all.js	2014-09-16 14:27:52.447743192 +0200
+@@ -844,7 +844,7 @@ pref("javascript.options.strict",
+ #ifdef DEBUG
+ pref("javascript.options.strict.debug",     true);
+ #endif
+-pref("javascript.options.baselinejit",      true);
++pref("javascript.options.baselinejit",      false);
+ pref("javascript.options.ion",              true);
+ pref("javascript.options.asmjs",            true);
+ pref("javascript.options.native_regexp",    true);
diff --git a/firefox.spec b/firefox.spec
index 1bafefe..c6c5f56 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -30,7 +30,7 @@ Summary:	Next generation web browser
 Name:		firefox
 Version:	%{major}
 Epoch:		%{ff_epoch}
-Release:	1
+Release:	2
 License:	MPLv1+
 Group:		Networking/WWW
 Url:		http://www.mozilla.com/firefox/
@@ -59,8 +59,8 @@ Patch34:	xulrunner_nojit.patch
 
 # Upstream patches
 
-# ROSA
-Patch90:	firefox-15.0-enable-addons.patch
+# Fedora
+Patch90:	firefox-baseline-disable.patch
 
 
 BuildRequires:	gtk+2-devel
@@ -177,7 +177,10 @@ Files and macros mainly for building Firefox extensions.
 %endif
 %endif
 
-#patch90 -p2 -b .addons
+# disable baseline JIT on i686 (rhbz#1047079)
+%ifarch %{ix86}
+%patch90 -p2 -b .baseline
+%endif
 
 pushd js/src
 autoconf-2.13
@@ -198,11 +201,7 @@ mk_add_options MOZ_MAKE_FLAGS="%{_smp_mflags}"
 mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/../obj
 ac_add_options --host=%{_host}
 ac_add_options --target=%{_target_platform}
-%ifarch %{ix86}
-ac_add_options --disable-optimize
-%else
 ac_add_options --enable-optimize
-%endif
 ac_add_options --prefix="%{_prefix}"
 ac_add_options --libdir="%{_libdir}"
 ac_add_options --sysconfdir="%{_sysconfdir}"