diff --git a/.gitignore b/.gitignore
index 17b2d93..081ccd6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,6 @@
-SOURCES/cbindgen-vendor.tar.xz
-SOURCES/nspr-4.35.0-1.el8_1.src.rpm
-SOURCES/nss-3.101.0-7.el8_2.src.rpm
-SOURCES/nss-3.101.0-7.el9_2.src.rpm
-SOURCES/thunderbird-128.10.0esr.processed-source.tar.xz
-SOURCES/thunderbird-langpacks-128.10.0esr-20250428.tar.xz
+cbindgen-vendor.tar.xz
+nspr-4.35.0-1.el8_1.src.rpm
+nss-3.101.0-7.el8_2.src.rpm
+nss-3.101.0-7.el9_2.src.rpm
+thunderbird-128.8.0esr.b5.processed-source.tar.xz
+thunderbird-langpacks-128.8.0esr-20250305.tar.xz
diff --git a/.thunderbird.metadata b/.thunderbird.metadata
deleted file mode 100644
index 1c7bf1c..0000000
--- a/.thunderbird.metadata
+++ /dev/null
@@ -1,6 +0,0 @@
-5012b69e54cbebe3b5e74011dacf3a2097f49921 SOURCES/cbindgen-vendor.tar.xz
-d744f92e874688cc4b5376477dfdd639a97a6cd4 SOURCES/nspr-4.35.0-1.el8_1.src.rpm
-f466d7213e85773e002c48897524eaf909480046 SOURCES/nss-3.101.0-7.el8_2.src.rpm
-0413d22a58ba1bba99acec9c3c2a4db56a4100c7 SOURCES/nss-3.101.0-7.el9_2.src.rpm
-c32d35afb300a89e0c702e1db5e923565f5c3989 SOURCES/thunderbird-128.10.0esr.processed-source.tar.xz
-9ad46c67f8e7458fac79ce6003a0b582fe606136 SOURCES/thunderbird-langpacks-128.10.0esr-20250428.tar.xz
diff --git a/SOURCES/build-big-endian-errors.patch b/build-big-endian-errors.patch
similarity index 100%
rename from SOURCES/build-big-endian-errors.patch
rename to build-big-endian-errors.patch
diff --git a/SOURCES/build-cargo-lock-version.patch b/build-cargo-lock-version.patch
similarity index 100%
rename from SOURCES/build-cargo-lock-version.patch
rename to build-cargo-lock-version.patch
diff --git a/SOURCES/build-disable-elfhack.patch b/build-disable-elfhack.patch
similarity index 100%
rename from SOURCES/build-disable-elfhack.patch
rename to build-disable-elfhack.patch
diff --git a/SOURCES/build-ffvpx.patch b/build-ffvpx.patch
similarity index 100%
rename from SOURCES/build-ffvpx.patch
rename to build-ffvpx.patch
diff --git a/SOURCES/build-libaom.patch b/build-libaom.patch
similarity index 100%
rename from SOURCES/build-libaom.patch
rename to build-libaom.patch
diff --git a/SOURCES/build-ppc64-abiv2.patch b/build-ppc64-abiv2.patch
similarity index 100%
rename from SOURCES/build-ppc64-abiv2.patch
rename to build-ppc64-abiv2.patch
diff --git a/SOURCES/build-rhel7-lower-node-min-version.patch b/build-rhel7-lower-node-min-version.patch
similarity index 100%
rename from SOURCES/build-rhel7-lower-node-min-version.patch
rename to build-rhel7-lower-node-min-version.patch
diff --git a/SOURCES/build-rhel7-nasm-dwarf.patch b/build-rhel7-nasm-dwarf.patch
similarity index 100%
rename from SOURCES/build-rhel7-nasm-dwarf.patch
rename to build-rhel7-nasm-dwarf.patch
diff --git a/SOURCES/disable-openpgp-in-thunderbird.patch b/disable-openpgp-in-thunderbird.patch
similarity index 100%
rename from SOURCES/disable-openpgp-in-thunderbird.patch
rename to disable-openpgp-in-thunderbird.patch
diff --git a/SOURCES/firefox-enable-addons.patch b/firefox-enable-addons.patch
similarity index 100%
rename from SOURCES/firefox-enable-addons.patch
rename to firefox-enable-addons.patch
diff --git a/SOURCES/firefox-gcc-build.patch b/firefox-gcc-build.patch
similarity index 100%
rename from SOURCES/firefox-gcc-build.patch
rename to firefox-gcc-build.patch
diff --git a/SOURCES/firefox-nss-addon-hack.patch b/firefox-nss-addon-hack.patch
similarity index 100%
rename from SOURCES/firefox-nss-addon-hack.patch
rename to firefox-nss-addon-hack.patch
diff --git a/SOURCES/firefox-system-nss-replace-xyber-with-mlkem.patch b/firefox-system-nss-replace-xyber-with-mlkem.patch
similarity index 100%
rename from SOURCES/firefox-system-nss-replace-xyber-with-mlkem.patch
rename to firefox-system-nss-replace-xyber-with-mlkem.patch
diff --git a/SOURCES/google-api-key b/google-api-key
similarity index 100%
rename from SOURCES/google-api-key
rename to google-api-key
diff --git a/SOURCES/google-loc-api-key b/google-loc-api-key
similarity index 100%
rename from SOURCES/google-loc-api-key
rename to google-loc-api-key
diff --git a/SOURCES/mozilla-api-key b/mozilla-api-key
similarity index 100%
rename from SOURCES/mozilla-api-key
rename to mozilla-api-key
diff --git a/SOURCES/mozilla-bmo1170092.patch b/mozilla-bmo1170092.patch
similarity index 100%
rename from SOURCES/mozilla-bmo1170092.patch
rename to mozilla-bmo1170092.patch
diff --git a/SOURCES/mozilla-bmo1504834-part1.patch b/mozilla-bmo1504834-part1.patch
similarity index 100%
rename from SOURCES/mozilla-bmo1504834-part1.patch
rename to mozilla-bmo1504834-part1.patch
diff --git a/SOURCES/mozilla-bmo1504834-part3.patch b/mozilla-bmo1504834-part3.patch
similarity index 100%
rename from SOURCES/mozilla-bmo1504834-part3.patch
rename to mozilla-bmo1504834-part3.patch
diff --git a/SOURCES/mozilla-bmo1670333.patch b/mozilla-bmo1670333.patch
similarity index 100%
rename from SOURCES/mozilla-bmo1670333.patch
rename to mozilla-bmo1670333.patch
diff --git a/SOURCES/mozilla-bmo1716707-svg.patch b/mozilla-bmo1716707-svg.patch
similarity index 100%
rename from SOURCES/mozilla-bmo1716707-svg.patch
rename to mozilla-bmo1716707-svg.patch
diff --git a/SOURCES/mozilla-bmo1716707-swizzle.patch b/mozilla-bmo1716707-swizzle.patch
similarity index 100%
rename from SOURCES/mozilla-bmo1716707-swizzle.patch
rename to mozilla-bmo1716707-swizzle.patch
diff --git a/SOURCES/mozilla-bmo1789216-disable-av1.patch b/mozilla-bmo1789216-disable-av1.patch
similarity index 100%
rename from SOURCES/mozilla-bmo1789216-disable-av1.patch
rename to mozilla-bmo1789216-disable-av1.patch
diff --git a/SOURCES/mozilla-bmo849632.patch b/mozilla-bmo849632.patch
similarity index 100%
rename from SOURCES/mozilla-bmo849632.patch
rename to mozilla-bmo849632.patch
diff --git a/SOURCES/mozilla-bmo998749.patch b/mozilla-bmo998749.patch
similarity index 100%
rename from SOURCES/mozilla-bmo998749.patch
rename to mozilla-bmo998749.patch
diff --git a/SOURCES/node-stdout-nonblocking-wrapper b/node-stdout-nonblocking-wrapper
similarity index 100%
rename from SOURCES/node-stdout-nonblocking-wrapper
rename to node-stdout-nonblocking-wrapper
diff --git a/SOURCES/nss-setup-flags-env.inc b/nss-setup-flags-env.inc
similarity index 100%
rename from SOURCES/nss-setup-flags-env.inc
rename to nss-setup-flags-env.inc
diff --git a/SOURCES/process-official-tarball b/process-official-tarball
similarity index 95%
rename from SOURCES/process-official-tarball
rename to process-official-tarball
index c3f4077..0ec4b47 100755
--- a/SOURCES/process-official-tarball
+++ b/process-official-tarball
@@ -20,9 +20,6 @@ rm -vf ./process-tarball-dir/*/third_party/python/pip/pip-24.0.dist-info/AUTHORS
 rm -vf ./process-tarball-dir/*/comm/third_party/rust/idna/tests/IdnaTestV2.txt
 rm -vr ./process-tarball-dir/*/comm/third_party/rust/wast/tests/parse-fail/confusing*
 
-# We uses system freetype2
-rm -vrf ./process-tarball-dir/*/modules/freetype2
-
 processed_tarball=${1/source/processed-source}
 
 cd ./process-tarball-dir
diff --git a/SOURCES/rhbz-1173156.patch b/rhbz-1173156.patch
similarity index 100%
rename from SOURCES/rhbz-1173156.patch
rename to rhbz-1173156.patch
diff --git a/SOURCES/rhbz-1354671.patch b/rhbz-1354671.patch
similarity index 100%
rename from SOURCES/rhbz-1354671.patch
rename to rhbz-1354671.patch
diff --git a/SOURCES/rust-file-removal.patch b/rust-file-removal.patch
similarity index 100%
rename from SOURCES/rust-file-removal.patch
rename to rust-file-removal.patch
diff --git a/sources b/sources
new file mode 100644
index 0000000..7895b53
--- /dev/null
+++ b/sources
@@ -0,0 +1,6 @@
+SHA512 (cbindgen-vendor.tar.xz) = 0c7a40033ccd38dadd30ad064feef390444af4562be07d3dfd0c4cccc55821b01b5228ddee367d0af3bd1b4ef9b1552cdd104506579b020ac1940a7c536b8b68
+SHA512 (nspr-4.35.0-1.el8_1.src.rpm) = 5123a443fcc42602e31104999be339ae899eb7b1f1e2f1ea87ba4f283eb894d08ab568e421dba1df4770f23be91ff88aa6a0748bce7feef31ed88bee5bdecb2c
+SHA512 (nss-3.101.0-7.el8_2.src.rpm) = c25551b06cf9239bb54aaf3edaea2c60804b449de4e06af4f5192bc181b5c6468ea8a69ddeff9de1b11bfc123e894b1ce8fc5d6deddfd5062f8736b75db56f8d
+SHA512 (nss-3.101.0-7.el9_2.src.rpm) = 7c325e0e437c1266031af02b3a026d20b789548ae435be6c39d710aa9d19c967ac0a79097fd50dd8ab878bf0d72c19e937d54863aa8cd0654ef2ef288e3102ec
+SHA512 (thunderbird-128.8.0esr.b5.processed-source.tar.xz) = 07b1645e71c26ae4f3fb2d31120bb8ad2544e9f51ccfaec484d1eddb7eeae7bd40af08385b45aed7169672f7a71f3af09d4d62cf206049d6515a9a75a1fae156
+SHA512 (thunderbird-langpacks-128.8.0esr-20250305.tar.xz) = 0e1c3067a243c838236c9effcbc42f2b673811f3d7fb8d21401eb87a55e052e18859e3e27b5235e984e6f79f44716c1682d2d6cc93c2a0e8dc55f926410d2ff1
diff --git a/SOURCES/thunderbird-mozconfig b/thunderbird-mozconfig
similarity index 100%
rename from SOURCES/thunderbird-mozconfig
rename to thunderbird-mozconfig
diff --git a/SOURCES/thunderbird-redhat-default-prefs.js b/thunderbird-redhat-default-prefs.js
similarity index 100%
rename from SOURCES/thunderbird-redhat-default-prefs.js
rename to thunderbird-redhat-default-prefs.js
diff --git a/SOURCES/thunderbird-symbolic.svg b/thunderbird-symbolic.svg
similarity index 100%
rename from SOURCES/thunderbird-symbolic.svg
rename to thunderbird-symbolic.svg
diff --git a/SOURCES/thunderbird-system-nss-replace-xyber-with-mlkem.patch b/thunderbird-system-nss-replace-xyber-with-mlkem.patch
similarity index 100%
rename from SOURCES/thunderbird-system-nss-replace-xyber-with-mlkem.patch
rename to thunderbird-system-nss-replace-xyber-with-mlkem.patch
diff --git a/SOURCES/thunderbird.desktop b/thunderbird.desktop
similarity index 100%
rename from SOURCES/thunderbird.desktop
rename to thunderbird.desktop
diff --git a/SOURCES/thunderbird.sh.in b/thunderbird.sh.in
similarity index 100%
rename from SOURCES/thunderbird.sh.in
rename to thunderbird.sh.in
diff --git a/SPECS/thunderbird.spec b/thunderbird.spec
similarity index 98%
rename from SPECS/thunderbird.spec
rename to thunderbird.spec
index 5a125a6..87b6053 100644
--- a/SPECS/thunderbird.spec
+++ b/thunderbird.spec
@@ -35,7 +35,7 @@ function dist_to_rhel_minor(str, start)
   end
   match = string.match(str, ".el9")
   if match then
-     return 7
+     return 6
   end
   match = string.match(str, ".el10_%d+")
   if match then
@@ -43,7 +43,7 @@ function dist_to_rhel_minor(str, start)
   end
   match = string.match(str, ".el10")
   if match then
-     return 1
+     return 0
   end
   return -1
 end}
@@ -88,7 +88,7 @@ end}
 
 %if 0%{?rhel} > 7 && 0%{?rhel} < 10
   %global use_gcc_ts      1
-  %if (0%{?rhel} == 9 && %{rhel_minor_version} >= 6) || (0%{?rhel} == 8 && %{rhel_minor_version} >= 10)
+  %if 0%{?rhel} == 9 && %{rhel_minor_version} >= 6
     # clang depends on gcc-toolset-14-gcc-c++
     %global gts_version 14
   %else
@@ -127,7 +127,7 @@ end}
 # If set to .b2 or .b3 ... the processed source file needs to be renamed before upload, e.g.
 # thunderbird-102.8.0.b2.processed-source.tar.xz
 # When unset use processed source file name as is.
-#%%global buildnum .b2
+%global buildnum .b5
 
 %bcond_without langpacks
 
@@ -137,8 +137,8 @@ end}
 
 Summary:        Mozilla Thunderbird mail/newsgroup client
 Name:           thunderbird
-Version:        128.10.0
-Release:        1%{?dist}
+Version:        128.8.0
+Release:        2%{?dist}
 URL:            http://www.mozilla.org/projects/thunderbird/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 
@@ -165,7 +165,7 @@ ExcludeArch:    %{ix86}
 #Source0:        https://archive.mozilla.org/pub/thunderbird/releases/%%{version}%%{?pre_version}/source/thunderbird-%%{version}%%{?pre_version}.processed-source.tar.xz
 Source0:        thunderbird-%{version}%{?pre_version}%{?buildnum}.processed-source.tar.xz
 %if %{with langpacks}
-Source1:        thunderbird-langpacks-%{version}%{?pre_version}-20250428.tar.xz
+Source1:        thunderbird-langpacks-%{version}%{?pre_version}-20250305.tar.xz
 %endif
 Source2:        cbindgen-vendor.tar.xz
 Source3:        process-official-tarball
@@ -333,9 +333,8 @@ BuildRequires: gcc-toolset-%{gts_version}-runtime
 BuildRequires: gcc-toolset-%{gts_version}-binutils
 BuildRequires: gcc-toolset-%{gts_version}-gcc
 BuildRequires: gcc-toolset-%{gts_version}-gcc-plugin-annobin
-# Do not explicitly require gcc-toolset-%%{gts_version}-gcc-c++ instead fail
+# Do not explicitly require gcc-toolset-%%{gts_version}-gcc-g++ instead fail
 # when clang is upgraded to depend on a later toolset and adjust version.
-# ERROR: The target C compiler is version 13.3.1, while the target C++ compiler is version 8.5.0. Need to use the same compiler version.
 %endif
 
 %if %{?use_openssl_for_librnp}
@@ -381,6 +380,7 @@ Provides: bundled(fathom)
 Provides: bundled(fdlibm)
 Provides: bundled(ffvpx)
 Provides: bundled(fluent.migratetb)
+Provides: bundled(freetype2)
 Provides: bundled(function2)
 Provides: bundled(gbm)
 Provides: bundled(gemmology)
@@ -1072,9 +1072,7 @@ echo "--------------------------------------------"
 %patch -P12 -p1 -b .firefox-system-nss-replace-xyber-with-mlkem
 %patch -P13 -p1 -b .thunderbird-system-nss-replace-xyber-with-mlkem
 %endif
-%if 0%{?rhel} == 8
 %patch -P14 -p1 -b .cargo-lock-version
-%endif
 
 # -- Upstreamed patches --
 %patch -P51 -p1 -b .mozilla-bmo1170092
@@ -1557,13 +1555,7 @@ touch $RPM_BUILD_ROOT%{mozappdir}/components/xpti.dat
 # Register as an application to be visible in the software center
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/metainfo
 %{__cp} -p comm/mail/branding/%{name}/net.thunderbird.Thunderbird.appdata.xml $RPM_BUILD_ROOT%{_datadir}/metainfo/thunderbird.appdata.xml
-%if 0%{?flatpak}
-# don't specify icon for flatpak appdata, icons are correctly named and packaged already
-# as org.mozilla.Thunderbird.png
-sed -i -e 's|<icon .*||' "$RPM_BUILD_ROOT%{_datadir}/metainfo/thunderbird.appdata.xml"
-%else
 sed -i -e 's|<icon .*|<icon type="stock">thunderbird</icon>|' "$RPM_BUILD_ROOT%{_datadir}/metainfo/thunderbird.appdata.xml"
-%endif
 
 # Clean the created bundled rpms.
 rm -rf %{_srcrpmdir}/libffi*.src.rpm
@@ -1641,7 +1633,6 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %endif
 %{mozappdir}/glxtest
 %{mozappdir}/vaapitest
-%{mozappdir}/interesting_serverknobs.json
 
 %if !%{?system_nss}
 %exclude %{mozappdir}/libnssckbi.so
@@ -1661,18 +1652,6 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 #===============================================================================
 
 %changelog
-* Mon Apr 28 2025 Eike Rathke <erack@redhat.com> - 128.10.0-1
-- Update to 128.10.0 build1
-
-* Wed Apr 16 2025 Eike Rathke <erack@redhat.com> - 128.9.2-1
-- Update to 128.9.2
-
-* Mon Mar 31 2025 Eike Rathke <erack@redhat.com> - 128.9.0-2
-- Update to 128.9.0 build3
-
-* Wed Mar 26 2025 Eike Rathke <erack@redhat.com> - 128.9.0-1
-- Update to 128.9.0 build1
-
 * Wed Mar 05 2025 Eike Rathke <erack@redhat.com> - 128.8.0-2
 - Update to 128.8.0 build5