diff --git a/.gitignore b/.gitignore
index 4e4c68b..d4538f4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -144,3 +144,5 @@
 /thunderbird-langpacks-128.8.0esr-20250303.tar.xz
 /thunderbird-128.8.0esr.b5.processed-source.tar.xz
 /thunderbird-langpacks-128.8.0esr-20250305.tar.xz
+/thunderbird-128.9.0esr.processed-source.tar.xz
+/thunderbird-langpacks-128.9.0esr-20250326.tar.xz
diff --git a/process-official-tarball b/process-official-tarball
index 0ec4b47..c3f4077 100755
--- a/process-official-tarball
+++ b/process-official-tarball
@@ -20,6 +20,9 @@ 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 b/sources
index bf89966..a5e35b9 100644
--- a/sources
+++ b/sources
@@ -2,5 +2,5 @@ SHA512 (nspr-4.35.0-1.el8_1.src.rpm) = 5123a443fcc42602e31104999be339ae899eb7b1f
 SHA512 (cbindgen-vendor.tar.xz) = 0c7a40033ccd38dadd30ad064feef390444af4562be07d3dfd0c4cccc55821b01b5228ddee367d0af3bd1b4ef9b1552cdd104506579b020ac1940a7c536b8b68
 SHA512 (nss-3.101.0-7.el9_2.src.rpm) = 7c325e0e437c1266031af02b3a026d20b789548ae435be6c39d710aa9d19c967ac0a79097fd50dd8ab878bf0d72c19e937d54863aa8cd0654ef2ef288e3102ec
 SHA512 (nss-3.101.0-7.el8_2.src.rpm) = c25551b06cf9239bb54aaf3edaea2c60804b449de4e06af4f5192bc181b5c6468ea8a69ddeff9de1b11bfc123e894b1ce8fc5d6deddfd5062f8736b75db56f8d
-SHA512 (thunderbird-128.8.0esr.b5.processed-source.tar.xz) = 07b1645e71c26ae4f3fb2d31120bb8ad2544e9f51ccfaec484d1eddb7eeae7bd40af08385b45aed7169672f7a71f3af09d4d62cf206049d6515a9a75a1fae156
-SHA512 (thunderbird-langpacks-128.8.0esr-20250305.tar.xz) = 0e1c3067a243c838236c9effcbc42f2b673811f3d7fb8d21401eb87a55e052e18859e3e27b5235e984e6f79f44716c1682d2d6cc93c2a0e8dc55f926410d2ff1
+SHA512 (thunderbird-128.9.0esr.b3.processed-source.tar.xz) = 445e2895574e121216467ef9d27f7fc287180257afdbb58e6b1a333dc9d26afaacacbf22588192c9ce31a84895b89998f7285eed154f458b61cf3ad9ddf9fb8d
+SHA512 (thunderbird-langpacks-128.9.0esr-20250331.tar.xz) = 0d80d78e4ba833bf6b3c66e89dc88d65fa3a66332acfc4dd984a63e39f477061c5e49d06ac81f3d0c30a96fcfb3111cb0ee075efda7077d645c31cc08dd27d96
diff --git a/thunderbird.spec b/thunderbird.spec
index dfee9e4..1e010a5 100644
--- a/thunderbird.spec
+++ b/thunderbird.spec
@@ -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 .b5
+%global buildnum .b3
 
 %bcond_without langpacks
 
@@ -137,7 +137,7 @@ end}
 
 Summary:        Mozilla Thunderbird mail/newsgroup client
 Name:           thunderbird
-Version:        128.8.0
+Version:        128.9.0
 Release:        2%{?dist}.alma.1
 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}-20250305.tar.xz
+Source1:        thunderbird-langpacks-%{version}%{?pre_version}-20250331.tar.xz
 %endif
 Source2:        cbindgen-vendor.tar.xz
 Source3:        process-official-tarball
@@ -380,7 +380,6 @@ 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)
@@ -1555,7 +1554,13 @@ 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
@@ -1633,6 +1638,7 @@ 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
@@ -1652,9 +1658,15 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 #===============================================================================
 
 %changelog
-* Thu Mar 27 2025 Eduard Abdullin <eabdullin@almalinux.org> - 128.8.0-2.alma.1
+* Tue Apr 15 2025 Eduard Abdullin <eabdullin@almalinux.org> - 128.9.0-2.alma.1
 - AlmaLinux changes
 
+* 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