diff --git a/.firefox.metadata b/.firefox.metadata
index 153ee7d..77172d9 100644
--- a/.firefox.metadata
+++ b/.firefox.metadata
@@ -1,7 +1,7 @@
 18a8f30a0356c751b8d0ea6f76e764cab13ee046 SOURCES/Python-2.7.13.tar.xz
 a9effcc06cf80eaa22f12c1f7d6aa4266a1c4966 SOURCES/cbindgen-vendor-0.14.3.tar.xz
-4cf96aeedca03d6f84ade360aeb43cae4819342a SOURCES/firefox-78.4.0esr.source.tar.xz
-3efe91763e5fe2f5c608e1d77b0322dfbbbab45c SOURCES/firefox-langpacks-78.4.0esr-20201016.tar.xz
+d2a0207af9d0777d26424c60e90fcc93b8b6ad09 SOURCES/firefox-78.4.1esr.source.tar.xz
+5b0babe09132b4c1f86caba3c4343010570b8d43 SOURCES/firefox-langpacks-78.4.1esr-20201109.tar.xz
 0de63f863b158454b9429234b52ed28a397ec45c SOURCES/gtk3-private-3.22.26-1.el6.src.rpm
 e188ab1a444697bc649e223c28389d82ca94c472 SOURCES/libffi-3.0.13-18.el7_3.src.rpm
 5715f987bc0024ce5d72993cb101b8268350033b SOURCES/nodejs-10.21.0-5.fc32.src.rpm
diff --git a/.gitignore b/.gitignore
index 5ee8e68..a150def 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,7 @@
 SOURCES/Python-2.7.13.tar.xz
 SOURCES/cbindgen-vendor-0.14.3.tar.xz
-SOURCES/firefox-78.4.0esr.source.tar.xz
-SOURCES/firefox-langpacks-78.4.0esr-20201016.tar.xz
+SOURCES/firefox-78.4.1esr.source.tar.xz
+SOURCES/firefox-langpacks-78.4.1esr-20201109.tar.xz
 SOURCES/gtk3-private-3.22.26-1.el6.src.rpm
 SOURCES/libffi-3.0.13-18.el7_3.src.rpm
 SOURCES/nodejs-10.21.0-5.fc32.src.rpm
diff --git a/README.debrand b/README.debrand
deleted file mode 100644
index 01c46d2..0000000
--- a/README.debrand
+++ /dev/null
@@ -1,2 +0,0 @@
-Warning: This package was configured for automatic debranding, but the changes
-failed to apply.
diff --git a/SOURCES/Bug-1238661---fix-mozillaSignalTrampoline-to-work-.patch b/SOURCES/Bug-1238661---fix-mozillaSignalTrampoline-to-work-.patch
deleted file mode 100644
index 6dfe2ad..0000000
--- a/SOURCES/Bug-1238661---fix-mozillaSignalTrampoline-to-work-.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up firefox-60.0/mfbt/LinuxSignal.h.mozilla-1238661 firefox-60.0/mfbt/LinuxSignal.h
---- firefox-60.0/mfbt/LinuxSignal.h.mozilla-1238661	2018-04-27 08:55:38.848241768 +0200
-+++ firefox-60.0/mfbt/LinuxSignal.h	2018-04-27 09:06:47.946769859 +0200
-@@ -22,7 +22,7 @@ __attribute__((naked)) void SignalTrampo
-                                              void* aContext) {
-   asm volatile("nop; nop; nop; nop" : : : "memory");
- 
--  asm volatile("b %0" : : "X"(H) : "memory");
-+  asm volatile("bx %0" : : "r"(H), "l"(aSignal), "l"(aInfo), "l"(aContext) : "memory");
- }
- 
- #  define MOZ_SIGNAL_TRAMPOLINE(h) (mozilla::SignalTrampoline<h>)
diff --git a/SOURCES/Bug-1526653---fix_user_vfp_armv7.patch b/SOURCES/Bug-1526653---fix_user_vfp_armv7.patch
deleted file mode 100644
index 3f84f95..0000000
--- a/SOURCES/Bug-1526653---fix_user_vfp_armv7.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From fd6847c9416f9eebde636e21d794d25d1be8791d Mon Sep 17 00:00:00 2001
-From: Mike Hommey <mh@glandium.org>
-Date: Sat, 1 Jun 2019 09:06:01 +0900
-Subject: [PATCH] Bug 1526653 - Include struct definitions for user_vfp and
- user_vfp_exc.
-
----
- js/src/wasm/WasmSignalHandlers.cpp | 11 ++++++++++-
- 1 file changed, 10 insertions(+), 1 deletion(-)
-
-diff --git a/js/src/wasm/WasmSignalHandlers.cpp b/js/src/wasm/WasmSignalHandlers.cpp
-index 636537f8478..383c380f04c 100644
---- a/js/src/wasm/WasmSignalHandlers.cpp
-+++ b/js/src/wasm/WasmSignalHandlers.cpp
-@@ -248,7 +248,16 @@ using mozilla::DebugOnly;
- #endif
- 
- #ifdef WASM_EMULATE_ARM_UNALIGNED_FP_ACCESS
--#  include <sys/user.h>
-+struct user_vfp {
-+  unsigned long long fpregs[32];
-+  unsigned long fpscr;
-+};
-+
-+struct user_vfp_exc {
-+  unsigned long fpexc;
-+  unsigned long fpinst;
-+  unsigned long fpinst2;
-+};
- #endif
- 
- #if defined(ANDROID)
--- 
-2.20.1
-
diff --git a/SOURCES/firefox-centos-default-prefs.js b/SOURCES/firefox-centos-default-prefs.js
deleted file mode 100644
index ea10021..0000000
--- a/SOURCES/firefox-centos-default-prefs.js
+++ /dev/null
@@ -1,35 +0,0 @@
-pref("app.update.auto",                     false);
-pref("app.update.enabled",                  false);
-pref("app.update.autoInstallEnabled",       false);
-pref("general.smoothScroll",                true);
-pref("intl.locale.matchOS",                 true);
-pref("toolkit.storage.synchronous",         0);
-pref("toolkit.networkmanager.disable",      false);
-pref("offline.autoDetect",                  true);
-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("network.manage-offline-status",       true);
-pref("extensions.shownSelectionUI",         true);
-pref("ui.SpellCheckerUnderlineStyle",       1);
-pref("startup.homepage_override_url",       "http://www.centos.org");
-pref("startup.homepage_welcome_url",        "http://www.centos.org");
-pref("browser.startup.homepage",            "data:text/plain,browser.startup.homepage=file:///usr/share/doc/HTML/index.html");
-pref("geo.wifi.uri", "https://location.services.mozilla.com/v1/geolocate?key=%MOZILLA_API_KEY%");
-pref("media.gmp-gmpopenh264.provider.enabled",false);
-pref("media.gmp-gmpopenh264.autoupdate",false);
-pref("media.gmp-gmpopenh264.enabled",false);
-pref("media.gmp-gmpopenh264.enabled",false);
-pref("plugins.notifyMissingFlash", false);
-/* See https://bugzilla.redhat.com/show_bug.cgi?id=1226489 */
-pref("browser.display.use_system_colors", false);
-pref("layers.use-image-offscreen-surfaces", false);
-/* Allow sending credetials to all https:// sites */
-pref("network.negotiate-auth.trusted-uris", "https://");
-pref("security.use_sqldb", false);
-/* Use OS settings for UI language */
-pref("intl.locale.requested", "");
-/* See https://bugzilla.redhat.com/show_bug.cgi?id=1672424 */
-pref("storage.nfs_filesystem", true);
diff --git a/SOURCES/firefox-mozconfig b/SOURCES/firefox-mozconfig
index 6efa937..cc9fda8 100644
--- a/SOURCES/firefox-mozconfig
+++ b/SOURCES/firefox-mozconfig
@@ -17,6 +17,7 @@ ac_add_options --with-mozilla-api-keyfile=../mozilla-api-key
 ac_add_options --with-google-location-service-api-keyfile=../google-api-key
 ac_add_options --with-google-safebrowsing-api-keyfile=../google-api-key
 ac_add_options --disable-av1
+ac_add_options --allow-addon-sideload
 
 export BUILD_OFFICIAL=1
 export MOZILLA_OFFICIAL=1
diff --git a/SOURCES/firefox.sh.in b/SOURCES/firefox.sh.in
index a33e812..2c8ffc1 100644
--- a/SOURCES/firefox.sh.in
+++ b/SOURCES/firefox.sh.in
@@ -153,15 +153,6 @@ export MOZ_USE_XINPUT2=1
 ##
 FEDORA_LANGPACK_CONFIG="$MOZ_EXTENSIONS_PROFILE_DIR/.fedora-langpack-install"
 
-# Since Firefox 60 the installation of individual langpack cannot be done by
-# copying xpi file to the home directory, because the langpack is loaded
-# as to the available languages after the language has been decided and
-# for the first run it won't be in language according to the locale.
-#
-# The current workaround is to put all langpacks to the location
-# for system wide extensions. So we set MOZ_DISABLE_LANGPACKS=1 for this moment
-export MOZ_DISABLE_LANGPACKS=1
-# MOZ_DISABLE_LANGPACKS disables language packs completely
 MOZILLA_DOWN=0
 if ! [ $MOZ_DISABLE_LANGPACKS ] || [ $MOZ_DISABLE_LANGPACKS -eq 0 ]; then
     if [ -x $MOZ_DIST_BIN/$MOZ_FIREFOX_FILE ]; then
diff --git a/SOURCES/rhel6-at-no-automount.patch b/SOURCES/rhel6-at-no-automount.patch
new file mode 100644
index 0000000..830ed54
--- /dev/null
+++ b/SOURCES/rhel6-at-no-automount.patch
@@ -0,0 +1,27 @@
+diff -ru firefox-78.3.0/security/sandbox/linux/SandboxFilter.cpp firefox-78.4.0/security/sandbox/linux/SandboxFilter.cpp
+--- firefox-78.3.0/security/sandbox/linux/SandboxFilter.cpp	2020-09-14 21:21:02.000000000 +0200
++++ firefox-78.4.0/security/sandbox/linux/SandboxFilter.cpp	2020-10-14 11:34:48.000000000 +0200
+@@ -243,14 +243,21 @@
+     auto path = reinterpret_cast<const char*>(aArgs.args[1]);
+     auto buf = reinterpret_cast<statstruct*>(aArgs.args[2]);
+     auto flags = static_cast<int>(aArgs.args[3]);
++
++    if (fd != AT_FDCWD && (flags & AT_EMPTY_PATH) != 0 &&
++        strcmp(path, "") == 0) {
++      return ConvertError(fstatsyscall(fd, buf));
++    }
++
+     if (fd != AT_FDCWD && path[0] != '/') {
+       SANDBOX_LOG_ERROR("unsupported fd-relative fstatat(%d, \"%s\", %p, %d)",
+                         fd, path, buf, flags);
+       return BlockedSyscallTrap(aArgs, nullptr);
+     }
+-    if ((flags & ~AT_SYMLINK_NOFOLLOW) != 0) {
++    if ((flags & ~(AT_SYMLINK_NOFOLLOW | AT_NO_AUTOMOUNT)) != 0) {
+       SANDBOX_LOG_ERROR("unsupported flags %d in fstatat(%d, \"%s\", %p, %d)",
+-                        (flags & ~AT_SYMLINK_NOFOLLOW), fd, path, buf, flags);
++                        (flags & ~(AT_SYMLINK_NOFOLLOW | AT_NO_AUTOMOUNT)), fd,
++                        path, buf, flags);
+       return BlockedSyscallTrap(aArgs, nullptr);
+     }
+     return (flags & AT_SYMLINK_NOFOLLOW) == 0 ? broker->Stat(path, buf)
diff --git a/SOURCES/rhel6-mozilla.sh.patch b/SOURCES/rhel6-mozilla.sh.patch
deleted file mode 100644
index 9ade86c..0000000
--- a/SOURCES/rhel6-mozilla.sh.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff -up firefox-73.0/build/unix/run-mozilla.sh.old firefox-73.0/build/unix/run-mozilla.sh
---- firefox-73.0/build/unix/run-mozilla.sh.old	2020-02-12 09:58:00.150895904 +0100
-+++ firefox-73.0/build/unix/run-mozilla.sh	2020-02-12 09:58:06.505860696 +0100
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#!/usr/bin/sh
- #
- # This Source Code Form is subject to the terms of the Mozilla Public
- # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/SPECS/firefox.spec b/SPECS/firefox.spec
index 0a0189a..b9a9f99 100644
--- a/SPECS/firefox.spec
+++ b/SPECS/firefox.spec
@@ -7,8 +7,11 @@
 %endif
 
 %global rhel_minor_version -1
+%if 0%{?flatpak:1}
+%global rhel_minor_version 4
+%endif
 %if "%{?dist}" == ".el8"
-%global rhel_minor_version 3
+%global rhel_minor_version 4
 %endif
 %if "%{?dist}" == ".el8_3"
 %global rhel_minor_version 3
@@ -210,7 +213,7 @@
 
 Summary:        Mozilla Firefox Web browser
 Name:           firefox
-Version:        78.4.0
+Version:        78.4.1
 Release:        1%{?dist}
 URL:            https://www.mozilla.org/firefox/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
@@ -223,7 +226,7 @@ ExclusiveArch:  i686 x86_64 ppc64 s390x
 
 Source0:        https://hg.mozilla.org/releases/mozilla-release/archive/firefox-%{version}%{?pre_version}.source.tar.xz
 %if %{build_langpacks}
-Source1:        firefox-langpacks-%{version}%{?pre_version}-20201016.tar.xz
+Source1:        firefox-langpacks-%{version}%{?pre_version}-20201109.tar.xz
 %endif
 Source2:        cbindgen-vendor-0.14.3.tar.xz
 Source10:       firefox-mozconfig
@@ -317,7 +320,7 @@ Patch602:        rhel6-mach-fail.patch
 Patch603:        rhel6-zconst.patch
 Patch604:        rhel6-auxvh.patch
 Patch605:        rhel6-abiv2-mozbz1642174.patch
-Patch606:        rhel6-mozilla.sh.patch
+Patch607:        rhel6-at-no-automount.patch
 
 %if %{?system_nss}
 %if !0%{?bundle_nss}
@@ -674,7 +677,7 @@ echo "use_bundled_yasm      %{?use_bundled_yasm}"
 %patch603 -p1 -b .rhel6-zconst
 %patch604 -p1 -b .rhel6-auxvh
 %patch605 -p1 -b .rhel6-abiv2-mozbz1642174
-%patch606 -p1 -b .rhel6-mozilla-sh
+%patch607 -R -p1 -b .rhel6-at-no-automount
 %endif
 
 # CentOS patches
@@ -947,7 +950,19 @@ function build_bundled_package() {
   %filter_from_requires /libssl3.so.*/d
   %filter_from_requires /libnssutil3.so.*/d
   %filter_from_requires /libnspr4.so.*/d
+%endif
 
+%if 0%{?rhel} == 6
+  %filter_from_requires /libnss3.so.*/d
+  %filter_from_requires /libsmime3.so.*/d
+  %filter_from_requires /libssl3.so.*/d
+  %filter_from_requires /libnssutil3.so.*/d
+  %filter_from_requires /libnspr4.so.*/d
+  %filter_from_provides /libnss3.so.*/d
+  %filter_from_provides /libsmime3.so.*/d
+  %filter_from_provides /libssl3.so.*/d
+  %filter_from_provides /libnssutil3.so.*/d
+  %filter_from_provides /libnspr4.so.*/d
 %endif
 
 %if 0%{?bundle_gtk3}
@@ -1165,8 +1180,8 @@ MOZ_SMP_FLAGS=-j1
 [ -z "$RPM_BUILD_NCPUS" ] && \
      RPM_BUILD_NCPUS="`/usr/bin/getconf _NPROCESSORS_ONLN`"
 [ "$RPM_BUILD_NCPUS" -ge 2 ] && MOZ_SMP_FLAGS=-j2
-[ "$RPM_BUILD_NCPUS" -ge 4 ] && MOZ_SMP_FLAGS=-j4
-[ "$RPM_BUILD_NCPUS" -ge 8 ] && MOZ_SMP_FLAGS=-j4
+[ "$RPM_BUILD_NCPUS" -ge 4 ] && MOZ_SMP_FLAGS=-j3
+[ "$RPM_BUILD_NCPUS" -ge 8 ] && MOZ_SMP_FLAGS=-j3
 %endif
 %endif
 
@@ -1176,23 +1191,13 @@ cat /proc/meminfo
 MEM_AVAILABLE=$(grep MemAvailable /proc/meminfo | awk '{ print $2 }')
 
 # Usually the compiler processes can take 2 GB of memory at peaks
+set -x
 TASK_SIZE=4000000
 MEM_CONSTRAINED_JOBS=$(( MEM_AVAILABLE / TASK_SIZE ))
 CPU_AVAILABLE=$(/usr/bin/getconf _NPROCESSORS_ONLN)
+set +x
 # Pick the minimum from available CPUs or memory constrained number of jobs
-#MOZ_SMP_FLAGS=-j$([ "$CPU_AVAILABLE" -le "$MEM_CONSTRAINED_JOBS" ] && echo "$CPU_AVAILABLE" || echo "$MEM_CONSTRAINED_JOBS")
-
-cat /proc/meminfo
-# Free memory in kB
-
-MEM_AVAILABLE=$(grep MemAvailable /proc/meminfo | awk '{ print $2 }')
-
-# Usually the compiler processes can take 2 GB of memory at peaks
-TASK_SIZE=4000000
-MEM_CONSTRAINED_JOBS=$(( MEM_AVAILABLE / TASK_SIZE ))
-CPU_AVAILABLE=$(/usr/bin/getconf _NPROCESSORS_ONLN)
-# Pick the minimum from available CPUs or memory constrained number of jobs
-#MOZ_SMP_FLAGS=-j$([ "$CPU_AVAILABLE" -le "$MEM_CONSTRAINED_JOBS" ] && echo "$CPU_AVAILABLE" || echo "$MEM_CONSTRAINED_JOBS")
+#TEMP DISABLE MOZ_SMP_FLAGS=-j$([ "$CPU_AVAILABLE" -le "$MEM_CONSTRAINED_JOBS" ] && echo "$CPU_AVAILABLE" || echo "$MEM_CONSTRAINED_JOBS")
 
 %if 0%{?bundle_gtk3}
 # gtk3-private-setup-flags-env.inc
@@ -1648,6 +1653,16 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 #---------------------------------------------------------------------
 
 %changelog
+* Tue Nov 10 2020 erack@redhat.com - 78.4.1-1
+- Update to 78.4.1
+- Filtering nss/nspr libs
+
+* Tue Nov 10 2020 Jan Horak <jhorak@redhat.com> - 78.4.0-3
+- Fixing flatpak build, fixing firefox.sh.in to not disable langpacks loading
+
+* Thu Oct 29 2020 Jan Horak <jhorak@redhat.com> - 78.4.0-2
+- Enable addon sideloading
+
 * Fri Oct 16 2020 Jan Horak <jhorak@redhat.com> - 78.4.0-1
 - Update to 78.4.0 build2