diff --git a/.gitignore b/.gitignore
index b02e6ba..cefc2dd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,6 @@ SOURCES/nodejs-10.21.0-5.fc32.src.rpm
 SOURCES/nspr-4.25.0-1.el8_0.src.rpm
 SOURCES/nss-3.53.1-3.fc32.src.rpm
 SOURCES/openssl-1.0.2k-19.6.bundle.el7_7.src.rpm
-SOURCES/thunderbird-78.12.0.source.tar.xz
-SOURCES/thunderbird-langpacks-78.12.0-20210712.tar.xz
+SOURCES/thunderbird-78.13.0.source.tar.xz
+SOURCES/thunderbird-langpacks-78.13.0-20210804.tar.xz
 SOURCES/yasm-1.2.0-3.el5.src.rpm
diff --git a/.thunderbird.metadata b/.thunderbird.metadata
index bfbc2d9..8e95808 100644
--- a/.thunderbird.metadata
+++ b/.thunderbird.metadata
@@ -6,6 +6,6 @@ e188ab1a444697bc649e223c28389d82ca94c472 SOURCES/libffi-3.0.13-18.el7_3.src.rpm
 07d67c90367c3ec0d6cebc1a5793c21076d34b78 SOURCES/nspr-4.25.0-1.el8_0.src.rpm
 223c02166b1cb9863b9f453ef687d7805a93e7af SOURCES/nss-3.53.1-3.fc32.src.rpm
 a379070abf5000cde61411c97af7e733b267a4d3 SOURCES/openssl-1.0.2k-19.6.bundle.el7_7.src.rpm
-98228bff32bf6cb7e0e34eb135a800d3200881c1 SOURCES/thunderbird-78.12.0.source.tar.xz
-a331ca78bb12b64578021ededef270d98a5762a5 SOURCES/thunderbird-langpacks-78.12.0-20210712.tar.xz
+2c397d21074cfebdb5519c123533eaaf2a3e3dbc SOURCES/thunderbird-78.13.0.source.tar.xz
+2b876b8ec02f0425896fdcb8457194f7d0862ac7 SOURCES/thunderbird-langpacks-78.13.0-20210804.tar.xz
 77fd30f7ebc12a629a31c1e252cec06af55a71fe SOURCES/yasm-1.2.0-3.el5.src.rpm
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/thunderbird-centos-default-prefs.js.el6 b/SOURCES/thunderbird-centos-default-prefs.js.el6
deleted file mode 100644
index a277f3d..0000000
--- a/SOURCES/thunderbird-centos-default-prefs.js.el6
+++ /dev/null
@@ -1,33 +0,0 @@
-pref("app.update.enabled", false);
-pref("app.update.autoInstallEnabled", false);
-# Allow users to set custom colors
-# pref("browser.display.use_system_colors",   true);
-pref("general.useragent.vendor", "CentOS");
-pref("general.useragent.vendorSub", "THUNDERBIRD_RPM_VR");
-pref("intl.locale.matchOS", true);
-pref("mail.shell.checkDefaultClient", false);
-pref("toolkit.networkmanager.disable", false);
-pref("offline.autoDetect", true);
-
-# Disable global indexing by default
-pref("mailnews.database.global.indexer.enabled", false);
-
-# Do not switch to Smart Folders after upgrade to 3.0b4
-pref("mail.folder.views.version", "1");
-pref("extensions.shownSelectionUI", true);
-pref("extensions.autoDisableScope", 0);
-
-# For rhbz#1024232
-pref("ui.SpellCheckerUnderlineStyle",       1);
-
-/* Workaround for rhbz#1134876 */
-pref("javascript.options.baselinejit",      false);
-/* Workaround for rhbz#1110291 */
-pref("network.negotiate-auth.allow-insecure-ntlm-v1", true);
-/* Workaround for mozbz#1063315 */
-pref("security.use_mozillapkix_verification", false);
-/* Use OS settings for UI language */
-pref("intl.locale.requested", "");
-pref("datareporting.healthreport.uploadEnabled", false);
-pref("datareporting.policy.dataSubmissionEnabled", false);
-pref("toolkit.telemetry.archive.enabled", false);
diff --git a/SOURCES/thunderbird-centos-default-prefs.js.el7 b/SOURCES/thunderbird-centos-default-prefs.js.el7
deleted file mode 100644
index a277f3d..0000000
--- a/SOURCES/thunderbird-centos-default-prefs.js.el7
+++ /dev/null
@@ -1,33 +0,0 @@
-pref("app.update.enabled", false);
-pref("app.update.autoInstallEnabled", false);
-# Allow users to set custom colors
-# pref("browser.display.use_system_colors",   true);
-pref("general.useragent.vendor", "CentOS");
-pref("general.useragent.vendorSub", "THUNDERBIRD_RPM_VR");
-pref("intl.locale.matchOS", true);
-pref("mail.shell.checkDefaultClient", false);
-pref("toolkit.networkmanager.disable", false);
-pref("offline.autoDetect", true);
-
-# Disable global indexing by default
-pref("mailnews.database.global.indexer.enabled", false);
-
-# Do not switch to Smart Folders after upgrade to 3.0b4
-pref("mail.folder.views.version", "1");
-pref("extensions.shownSelectionUI", true);
-pref("extensions.autoDisableScope", 0);
-
-# For rhbz#1024232
-pref("ui.SpellCheckerUnderlineStyle",       1);
-
-/* Workaround for rhbz#1134876 */
-pref("javascript.options.baselinejit",      false);
-/* Workaround for rhbz#1110291 */
-pref("network.negotiate-auth.allow-insecure-ntlm-v1", true);
-/* Workaround for mozbz#1063315 */
-pref("security.use_mozillapkix_verification", false);
-/* Use OS settings for UI language */
-pref("intl.locale.requested", "");
-pref("datareporting.healthreport.uploadEnabled", false);
-pref("datareporting.policy.dataSubmissionEnabled", false);
-pref("toolkit.telemetry.archive.enabled", false);
diff --git a/SOURCES/thunderbird-redhat-default-prefs.js.rhel6 b/SOURCES/thunderbird-redhat-default-prefs.js.rhel6
new file mode 100644
index 0000000..26e8d17
--- /dev/null
+++ b/SOURCES/thunderbird-redhat-default-prefs.js.rhel6
@@ -0,0 +1,33 @@
+pref("app.update.enabled", false);
+pref("app.update.autoInstallEnabled", false);
+# Allow users to set custom colors
+# pref("browser.display.use_system_colors",   true);
+pref("general.useragent.vendor", "Red Hat");
+pref("general.useragent.vendorSub", "THUNDERBIRD_RPM_VR");
+pref("intl.locale.matchOS", true);
+pref("mail.shell.checkDefaultClient", false);
+pref("toolkit.networkmanager.disable", false);
+pref("offline.autoDetect", true);
+
+# Disable global indexing by default
+pref("mailnews.database.global.indexer.enabled", false);
+
+# Do not switch to Smart Folders after upgrade to 3.0b4
+pref("mail.folder.views.version", "1");
+pref("extensions.shownSelectionUI", true);
+pref("extensions.autoDisableScope", 0);
+
+# For rhbz#1024232
+pref("ui.SpellCheckerUnderlineStyle",       1);
+
+/* Workaround for rhbz#1134876 */
+pref("javascript.options.baselinejit",      false);
+/* Workaround for rhbz#1110291 */
+pref("network.negotiate-auth.allow-insecure-ntlm-v1", true);
+/* Workaround for mozbz#1063315 */
+pref("security.use_mozillapkix_verification", false);
+/* Use OS settings for UI language */
+pref("intl.locale.requested", "");
+pref("datareporting.healthreport.uploadEnabled", false);
+pref("datareporting.policy.dataSubmissionEnabled", false);
+pref("toolkit.telemetry.archive.enabled", false);
diff --git a/SOURCES/thunderbird-redhat-default-prefs.js.rhel7 b/SOURCES/thunderbird-redhat-default-prefs.js.rhel7
new file mode 100644
index 0000000..26e8d17
--- /dev/null
+++ b/SOURCES/thunderbird-redhat-default-prefs.js.rhel7
@@ -0,0 +1,33 @@
+pref("app.update.enabled", false);
+pref("app.update.autoInstallEnabled", false);
+# Allow users to set custom colors
+# pref("browser.display.use_system_colors",   true);
+pref("general.useragent.vendor", "Red Hat");
+pref("general.useragent.vendorSub", "THUNDERBIRD_RPM_VR");
+pref("intl.locale.matchOS", true);
+pref("mail.shell.checkDefaultClient", false);
+pref("toolkit.networkmanager.disable", false);
+pref("offline.autoDetect", true);
+
+# Disable global indexing by default
+pref("mailnews.database.global.indexer.enabled", false);
+
+# Do not switch to Smart Folders after upgrade to 3.0b4
+pref("mail.folder.views.version", "1");
+pref("extensions.shownSelectionUI", true);
+pref("extensions.autoDisableScope", 0);
+
+# For rhbz#1024232
+pref("ui.SpellCheckerUnderlineStyle",       1);
+
+/* Workaround for rhbz#1134876 */
+pref("javascript.options.baselinejit",      false);
+/* Workaround for rhbz#1110291 */
+pref("network.negotiate-auth.allow-insecure-ntlm-v1", true);
+/* Workaround for mozbz#1063315 */
+pref("security.use_mozillapkix_verification", false);
+/* Use OS settings for UI language */
+pref("intl.locale.requested", "");
+pref("datareporting.healthreport.uploadEnabled", false);
+pref("datareporting.policy.dataSubmissionEnabled", false);
+pref("toolkit.telemetry.archive.enabled", false);
diff --git a/SPECS/thunderbird.spec b/SPECS/thunderbird.spec
index da58191..cf8c397 100644
--- a/SPECS/thunderbird.spec
+++ b/SPECS/thunderbird.spec
@@ -136,10 +136,10 @@ end}
 %global nspr_version 4.25
 # NSS/NSPR quite often ends in build override, so as requirement the version
 # we're building against could bring us some broken dependencies from time to time.
-#%global nspr_build_version %(pkg-config --silence-errors --modversion nspr 2>/dev/null || echo 65536)
+#%%global nspr_build_version %%(pkg-config --silence-errors --modversion nspr 2>/dev/null || echo 65536)
 %global nspr_build_version %{nspr_version}
 %global nss_version 3.53.1
-#%global nss_build_version %(pkg-config --silence-errors --modversion nss 2>/dev/null || echo 65536)
+#%%global nss_build_version %%(pkg-config --silence-errors --modversion nss 2>/dev/null || echo 65536)
 %global nss_build_version %{nss_version}
 %endif
 
@@ -187,14 +187,15 @@ end}
 %global mozappdirdev  %{_libdir}/%{name}-devel-%{version}
 %global langpackdir   %{mozappdir}/distribution/extensions
 %global tarballdir    %{name}-%{version}
+%global mozappfeatures %{mozappdir}/features/*.xpi
 #global pre_tag       alpha
 
 %global official_branding       1
 %global build_langpacks         1
 Summary:        Mozilla Thunderbird mail/newsgroup client
 Name:           thunderbird
-Version:        78.12.0
-Release:        3%{?dist}
+Version:        78.13.0
+Release:        1%{?dist}
 URL:            http://www.mozilla.org/projects/thunderbird/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
@@ -206,10 +207,10 @@ ExcludeArch:    s390 ppc
 ExclusiveArch:  i686 x86_64 ppc64 s390x
 %endif
 
-# From ftp://archive.mozilla.org/pub/thunderbird/releases/%{version}%{?ext_version}/source
+# From ftp://archive.mozilla.org/pub/thunderbird/releases/%%{version}%%{?ext_version}/source
 Source0:        https://archive.mozilla.org/pub/thunderbird/releases/%{version}%{?pre_version}/source/thunderbird-%{version}%{?pre_version}.source.tar.xz
 %if %{build_langpacks}
-Source1:        thunderbird-langpacks-%{version}%{?ext_version}-20210712.tar.xz
+Source1:        thunderbird-langpacks-%{version}%{?ext_version}-20210804.tar.xz
 # Locales for lightning
 %endif
 Source2:        cbindgen-vendor-0.14.3.tar.xz
@@ -233,8 +234,8 @@ Source301:      yasm-1.2.0-3.el5.src.rpm
 Source303:      libffi-3.0.13-18.el7_3.src.rpm
 Source304:      nodejs-10.21.0-5.fc32.src.rpm
 Source305:      openssl-1.0.2k-19.6.bundle.el7_7.src.rpm
-Source601:      thunderbird-centos-default-prefs.js.el6
-Source701:      thunderbird-centos-default-prefs.js.el7
+Source601:      thunderbird-redhat-default-prefs.js.rhel6
+Source701:      thunderbird-redhat-default-prefs.js.rhel7
 
 ## Firefox patches
 
@@ -521,8 +522,8 @@ Obsoletes:      thunderbird-lightning
 # Override internal dependency generator to avoid showing libraries provided by this package
 # in dependencies:
 #AutoProv: 0
-#%define _use_internal_dependency_generator 0
-#%define __find_requires %{SOURCE101}
+#%%define _use_internal_dependency_generator 0
+#%%define __find_requires %{SOURCE101}
 
 %description
 Mozilla Thunderbird is a standalone mail and newsgroup client.
@@ -1321,6 +1322,14 @@ echo "Adding following langpacks:"
 cat %{name}.lang
 %endif
 
+# Install feature extensions.
+echo > %{name}.features
+if [ -f "$(ls -1 %{mozappfeatures} | head -1)" ]; then
+    ls -1 %{mozappfeatures} >> %{name}.features
+    echo "Adding following features:"
+    cat %{name}.features
+fi
+
 # Get rid of devel package and its debugsymbols
 %{__rm} -rf %{buildroot}%{_libdir}/%{name}-devel-%{version}
 
@@ -1442,7 +1451,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %endif
 
 #===============================================================================
-%files -f %{name}.lang
+%files -f %{name}.lang -f %{name}.features
 %defattr(-,root,root,-)
 %attr(755,root,root) %{_bindir}/thunderbird
 %{_datadir}/appdata/*.appdata.xml
@@ -1466,7 +1475,6 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{mozappdir}/*.so
 %{mozappdir}/platform.ini
 %{mozappdir}/application.ini
-%{mozappdir}/features/*.xpi
 %exclude %{mozappdir}/removed-files
 %{_datadir}/icons/hicolor/16x16/apps/thunderbird.png
 %{_datadir}/icons/hicolor/22x22/apps/thunderbird.png
@@ -1481,7 +1489,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{mozappdir}/fonts/TwemojiMozilla.ttf
 
 %if !%{?system_libicu}
-#%{mozappdir}/icudt*.dat
+#%%{mozappdir}/icudt*.dat
 %endif
 %if !%{?system_nss}
 %exclude %{mozappdir}/libnssckbi.so
@@ -1512,8 +1520,8 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 #===============================================================================
 
 %changelog
-* Mon Jul 26 2021 CentOS Sources <bugs@centos.org> - 78.12.0-3.el8.centos
-- Apply debranding changes
+* Wed Aug 04 2021 Eike Rathke <erack@redhat.com> - 78.13.0-1
+- Update to 78.13.0 build1
 
 * Fri Jul 16 2021 Jan Horak <jhorak@redhat.com> - 78.12.0-3
 - Rebuild to pickup older nss