diff --git a/.firefox.metadata b/.firefox.metadata
index 8f0e37e..1a5b432 100644
--- a/.firefox.metadata
+++ b/.firefox.metadata
@@ -1,2 +1,2 @@
-061912d61e3ff2766b7fb1082d91af50d10b545a SOURCES/firefox-langpacks-24.6.0esr-20140604.tar.bz2
-9dfbf8c5cf749a142890011071bd5fbeab60d20d SOURCES/firefox-24.6.0esr.source.tar.bz2
+b5c2df8726846b40bcb320892cddda2b5ec44dd3 SOURCES/firefox-langpacks-24.7.0esr-20140717.tar.bz2
+b7d93b2d8af7028670b6fa17177e4316670d3724 SOURCES/firefox-24.7.0esr.source.tar.bz2
diff --git a/.gitignore b/.gitignore
index 5fd40f6..5a34509 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-SOURCES/firefox-langpacks-24.6.0esr-20140604.tar.bz2
-SOURCES/firefox-24.6.0esr.source.tar.bz2
+SOURCES/firefox-langpacks-24.7.0esr-20140717.tar.bz2
+SOURCES/firefox-24.7.0esr.source.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
new file mode 100644
index 0000000..2a22d05
--- /dev/null
+++ b/SOURCES/firefox-redhat-default-prefs.js
@@ -0,0 +1,24 @@
+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", "Red Hat");
+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.redhat.com");
+pref("startup.homepage_welcome_url", "http://www.redhat.com");
+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-system-nss-3.16.2.patch b/SOURCES/firefox-system-nss-3.16.2.patch
new file mode 100644
index 0000000..80a5712
--- /dev/null
+++ b/SOURCES/firefox-system-nss-3.16.2.patch
@@ -0,0 +1,12 @@
+diff -up firefox-24.3.0/mozilla-esr24/configure.in.nss firefox-24.3.0/mozilla-esr24/configure.in
+--- firefox-24.3.0/mozilla-esr24/configure.in.nss 2014-01-30 15:46:38.000000000 +0100
++++ firefox-24.3.0/mozilla-esr24/configure.in 2014-01-30 17:01:30.614179142 +0100
+@@ -3944,7 +3944,7 @@ MOZ_ARG_WITH_BOOL(system-nss,
+ _USE_SYSTEM_NSS=1 )
+
+ if test -n "$_USE_SYSTEM_NSS"; then
+- AM_PATH_NSS(3.16.2, [MOZ_NATIVE_NSS=1], [AC_MSG_ERROR([you don't have NSS installed or your version is too old])])
++ AM_PATH_NSS(3.15.4, [MOZ_NATIVE_NSS=1], [AC_MSG_ERROR([you don't have NSS installed or your version is too old])])
+ fi
+
+ if test -n "$MOZ_NATIVE_NSS"; then
diff --git a/SPECS/firefox.spec b/SPECS/firefox.spec
index 8e34b47..fec95b5 100644
--- a/SPECS/firefox.spec
+++ b/SPECS/firefox.spec
@@ -23,8 +23,8 @@
# Minimal required versions
%if %{?system_nss}
-%define nspr_version 4.10
-%define nss_version 3.15
+%define nspr_version 4.10.2
+%define nss_version 3.15.4
%endif
%define cairo_version 1.10.2
@@ -53,7 +53,7 @@
Summary: Mozilla Firefox Web browser
Name: firefox
-Version: 24.6.0
+Version: 24.7.0
Release: 1%{?prever}%{?dist}
URL: http://www.mozilla.org/projects/firefox/
License: MPLv1.1 or GPLv2+ or LGPLv2+
@@ -61,11 +61,11 @@ 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}-20140604.tar.bz2
+Source1: firefox-langpacks-%{version}%{?ext_version}-20140717.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
@@ -81,10 +81,13 @@ Patch11: firefox-24.0-default.patch
Patch12: firefox-17.0-enable-addons.patch
Patch13: rhbz-966424.patch
Patch14: rhbz-1032770.patch
+Patch15: firefox-system-nss-3.16.2.patch
-# Upstream patches
+# RHEL patches
Patch100: firefox-5.0-asciidel.patch
Patch200: firefox-duckduckgo.patch
+
+# Upstream patches
Patch300: mozilla-906754.patch
%if %{official_branding}
@@ -188,8 +191,9 @@ cd %{tarballdir}
%patch12 -p1 -b .addons
%patch13 -p1 -b .rhbz-966424
%patch14 -p1 -b .rhbz-1032770
+%patch15 -p2 -b .nss-3.16.2
-# For branding specific patches.
+# RHEL patches
%patch100 -p1 -b .asciidel
%patch200 -p1 -b .duckduckgo
@@ -502,8 +506,8 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
#---------------------------------------------------------------------
%changelog
-* Sat Jun 21 2014 Johnny Hughes <johnny@centos.org> - 24.6.0-1.el7.centos
-- Roll in CentoS Branding
+* Thu Jul 17 2014 Jan Horak <jhorak@redhat.com> - 24.7.0-1
+- Update to 24.7.0 ESR
* Wed Jun 4 2014 Jan Horak <jhorak@redhat.com> - 24.6.0-1
- Update to 24.6.0 ESR