diff --git a/.firefox.metadata b/.firefox.metadata
index 81ee5b1..29e8f70 100644
--- a/.firefox.metadata
+++ b/.firefox.metadata
@@ -1,2 +1,2 @@
-d84451f86664b7cc1ef380e735b03db410f48c18 SOURCES/firefox-31.1.0esr.source.tar.bz2
-eeae78d0ce88732439a0be497a50f0f009c63df8 SOURCES/firefox-langpacks-31.1.0esr-20140828.tar.bz2
+9ddfde95fcd19633446f859c5bca77c62815d390 SOURCES/firefox-31.2.0esr.source.tar.bz2
+34d90db6c3f14043392ff5fcd0bd36eb03b66227 SOURCES/firefox-langpacks-31.2.0esr-20141013.tar.bz2
diff --git a/.gitignore b/.gitignore
index e6a1bf7..1597334 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-SOURCES/firefox-31.1.0esr.source.tar.bz2
-SOURCES/firefox-langpacks-31.1.0esr-20140828.tar.bz2
+SOURCES/firefox-31.2.0esr.source.tar.bz2
+SOURCES/firefox-langpacks-31.2.0esr-20141013.tar.bz2
diff --git a/SOURCES/firefox-centos-default-prefs.js b/SOURCES/firefox-centos-default-prefs.js
deleted file mode 100644
index ee2943f..0000000
--- a/SOURCES/firefox-centos-default-prefs.js
+++ /dev/null
@@ -1,24 +0,0 @@
-pref("app.update.auto", false);
-pref("app.update.enabled", false);
-pref("app.update.autoInstallEnabled", false);
-pref("browser.backspace_action", 2);
-pref("browser.display.use_system_colors", true);
-pref("browser.download.folderList", 1);
-pref("browser.link.open_external", 3);
-pref("browser.shell.checkDefaultBrowser", false);
-pref("general.smoothScroll", true);
-pref("general.useragent.vendor", "CentOS");
-pref("general.useragent.vendorSub", "FIREFOX_RPM_VR");
-pref("intl.locale.matchOS", true);
-pref("storage.nfs_filesystem", false);
-pref("dom.ipc.plugins.enabled.nswrapper*", false);
-pref("network.manage-offline-status", true);
-pref("toolkit.networkmanager.disable", false);
-pref("browser.startup.homepage", "data:text/plain,browser.startup.homepage=file:///usr/share/doc/HTML/index.html");
-pref("toolkit.storage.synchronous", 0);
-pref("startup.homepage_override_url", "http://www.centos.org");
-pref("startup.homepage_welcome_url", "http://www.centos.org");
-pref("javascript.options.baselinejit.content", false);
-pref("javascript.options.baselinejit.chrome", false);
-pref("extensions.shownSelectionUI", true);
-pref("layout.imagevisibility.enabled", false);
diff --git a/SOURCES/firefox-redhat-default-prefs.js b/SOURCES/firefox-redhat-default-prefs.js
index b258458..17c488a 100644
--- a/SOURCES/firefox-redhat-default-prefs.js
+++ b/SOURCES/firefox-redhat-default-prefs.js
@@ -21,6 +21,7 @@ pref("startup.homepage_welcome_url", "http://www.redhat.com");
/* Workaround for rhbz#1134876 */
pref("javascript.options.baselinejit", false);
pref("extensions.shownSelectionUI", true);
+/* Workaround for rhbz#1110291 */
pref("network.negotiate-auth.allow-insecure-ntlm-v1", true);
/* Workaround for mozbz#1063315 */
pref("security.use_mozillapkix_verification", false);
diff --git a/SPECS/firefox.spec b/SPECS/firefox.spec
index e3aa2d5..b071bd9 100644
--- a/SPECS/firefox.spec
+++ b/SPECS/firefox.spec
@@ -6,11 +6,7 @@
%define system_nss 1
# Enable webm
-%ifarch %{ix86} x86_64 ppc ppc64
%define enable_webm 1
-%else
-%define enable_webm 0
-%endif
# Use system cairo?
%define system_cairo 0
@@ -53,21 +49,22 @@
%define ext_version esr
%endif
+
Summary: Mozilla Firefox Web browser
Name: firefox
-Version: 31.1.0
-Release: 6%{?prever}%{?dist}
+Version: 31.2.0
+Release: 3%{?prever}%{?dist}
URL: http://www.mozilla.org/projects/firefox/
License: MPLv1.1 or GPLv2+ or LGPLv2+
Group: Applications/Internet
# From ftp://ftp.mozilla.org/pub/firefox/releases/%{version}%{?pretag}/source
Source0: firefox-%{version}%{?prever}%{?ext_version}.source.tar.bz2
%if %{build_langpacks}
-Source1: firefox-langpacks-%{version}%{?ext_version}-20140828.tar.bz2
+Source1: firefox-langpacks-%{version}%{?ext_version}-20141013.tar.bz2
%endif
Source10: firefox-mozconfig
Source11: firefox-mozconfig-branded
-Source12: firefox-centos-default-prefs.js
+Source12: firefox-redhat-default-prefs.js
Source20: firefox.desktop
Source21: firefox.sh.in
Source23: firefox.1
@@ -506,8 +503,12 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
#---------------------------------------------------------------------
%changelog
-* Wed Sep 17 2014 CentOS Sources <bugs@centos.org> - 31.1.0-6.el7.centos
-- CentOS default prefs
+* Tue Oct 7 2014 Jan Horak <jhorak@redhat.com> - 31.2.0-3
+- Update to 31.2.0 ESR
+- Fix for mozbz#1042889
+
+* Wed Oct 1 2014 Martin Stransky <stransky@redhat.com> - 31.1.0-7
+- Enable WebM on all arches
* Thu Sep 11 2014 Martin Stransky <stransky@redhat.com> - 31.1.0-6
- Enable all NPAPI plugins by default to keep compatibility