diff --git a/.firefox.metadata b/.firefox.metadata
index f7c870b..dbcc8c1 100644
--- a/.firefox.metadata
+++ b/.firefox.metadata
@@ -1,2 +1,2 @@
-57d2c255348ac13b6ffbb952c5e0d57757aa0290 SOURCES/firefox-38.3.0esr.source.tar.bz2
-9c94dd8d46ec76943a803297dad031000f36007a SOURCES/firefox-langpacks-38.3.0esr-20150917.tar.bz2
+a6a74fbd517544be5af335023895616cb1c3a67e SOURCES/firefox-38.4.0esr.source.tar.bz2
+b51ee01a844665bfa3f649c2574e240ef39d01a5 SOURCES/firefox-langpacks-38.4.0esr-20151029.tar.bz2
diff --git a/.gitignore b/.gitignore
index 4da29b7..d8ae696 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-SOURCES/firefox-38.3.0esr.source.tar.bz2
-SOURCES/firefox-langpacks-38.3.0esr-20150917.tar.bz2
+SOURCES/firefox-38.4.0esr.source.tar.bz2
+SOURCES/firefox-langpacks-38.4.0esr-20151029.tar.bz2
diff --git a/SOURCES/firefox-centos-default-prefs.js b/SOURCES/firefox-centos-default-prefs.js
deleted file mode 100644
index 93bd939..0000000
--- a/SOURCES/firefox-centos-default-prefs.js
+++ /dev/null
@@ -1,28 +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");
-/* Workaround for rhbz#1134876 */
-pref("javascript.options.baselinejit", true);
-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);
-pref("geo.wifi.uri", "https://location.services.mozilla.com/v1/geolocate?key=%MOZILLA_API_KEY%");
diff --git a/SOURCES/firefox-nss-3.19.1.patch b/SOURCES/firefox-nss-3.19.1.patch
index 53c8426..44f6519 100644
--- a/SOURCES/firefox-nss-3.19.1.patch
+++ b/SOURCES/firefox-nss-3.19.1.patch
@@ -1,11 +1,20 @@
-diff -up mozilla-esr38/configure.in.nss-3.19.0 mozilla-esr38/configure.in
---- mozilla-esr38/configure.in.nss-3.19.0 2015-06-25 10:36:40.205019840 +0200
-+++ mozilla-esr38/configure.in 2015-06-25 11:58:46.859155245 +0200
+diff -up mozilla-esr38/configure.in.nss-3.19.1 mozilla-esr38/configure.in
+--- mozilla-esr38/configure.in.nss-3.19.1 2015-10-29 11:17:50.666423563 +0100
++++ mozilla-esr38/configure.in 2015-10-29 11:28:06.142004473 +0100
+@@ -52,7 +52,7 @@ dnl ====================================
+ MOZJPEG=62
+ MOZPNG=10616
+ NSPR_VERSION=4
+-NSPR_MINVER=4.10.10
++NSPR_MINVER=4.10.8
+ NSS_VERSION=3
+
+ dnl Set the minimum version of toolkit libs used by mozilla
@@ -3627,7 +3627,7 @@ MOZ_ARG_WITH_BOOL(system-nss,
_USE_SYSTEM_NSS=1 )
if test -n "$_USE_SYSTEM_NSS"; then
-- AM_PATH_NSS(3.19.2, [MOZ_NATIVE_NSS=1], [AC_MSG_ERROR([you don't have NSS installed or your version is too old])])
+- AM_PATH_NSS(3.19.2.1, [MOZ_NATIVE_NSS=1], [AC_MSG_ERROR([you don't have NSS installed or your version is too old])])
+ AM_PATH_NSS(3.19.1, [MOZ_NATIVE_NSS=1], [AC_MSG_ERROR([you don't have NSS installed or your version is too old])])
fi
diff --git a/SOURCES/firefox-redhat-default-prefs.js b/SOURCES/firefox-redhat-default-prefs.js
new file mode 100644
index 0000000..2706b38
--- /dev/null
+++ b/SOURCES/firefox-redhat-default-prefs.js
@@ -0,0 +1,28 @@
+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");
+/* Workaround for rhbz#1134876 */
+pref("javascript.options.baselinejit", true);
+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);
+pref("geo.wifi.uri", "https://location.services.mozilla.com/v1/geolocate?key=%MOZILLA_API_KEY%");
diff --git a/SPECS/firefox.spec b/SPECS/firefox.spec
index 406fcfe..1dbaf3e 100644
--- a/SPECS/firefox.spec
+++ b/SPECS/firefox.spec
@@ -19,8 +19,8 @@
# Minimal required versions
%if %{?system_nss}
-%global nspr_version 4.10.8
-%global nss_version 3.18.0
+%global nspr_version 4.10.8-2
+%global nss_version 3.19.1-7
%endif
%define cairo_version 1.10.2
@@ -53,19 +53,19 @@
Summary: Mozilla Firefox Web browser
Name: firefox
-Version: 38.3.0
-Release: 2%{?prever}%{?dist}
+Version: 38.4.0
+Release: 1%{?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}-20150917.tar.bz2
+Source1: firefox-langpacks-%{version}%{?ext_version}-20151029.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
@@ -533,8 +533,8 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
#---------------------------------------------------------------------
%changelog
-* Tue Sep 22 2015 CentOS Sources <bugs@centos.org> - 38.3.0-2.el7.centos
-- CentOS default prefs
+* Thu Oct 29 2015 Jan Horak <jhorak@redhat.com> - 38.4.0-1
+- Update to 38.4.0 ESR
* Tue Sep 15 2015 Jan Horak <jhorak@redhat.com> - 38.3.0-2
- Update to 38.3.0 ESR