diff --git a/.gitignore b/.gitignore
index d47ffc6..e1f3642 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
 SOURCES/cbindgen-vendor.tar.xz
 SOURCES/nspr-4.32.0-1.el8_1.src.rpm
 SOURCES/nss-3.67.0-7.el8_1.src.rpm
-SOURCES/thunderbird-91.8.0.processed-source.tar.xz
-SOURCES/thunderbird-langpacks-91.8.0-20220405.tar.xz
+SOURCES/thunderbird-91.9.0.processed-source.tar.xz
+SOURCES/thunderbird-langpacks-91.9.0-20220503.tar.xz
diff --git a/.thunderbird.metadata b/.thunderbird.metadata
index a40c082..437aa41 100644
--- a/.thunderbird.metadata
+++ b/.thunderbird.metadata
@@ -1,5 +1,5 @@
 c822547dbc12e2baebdfdfb38b665e23f0c2513a SOURCES/cbindgen-vendor.tar.xz
 b5fd1332d8e0d37339ae170c7bebcb63a40b22e0 SOURCES/nspr-4.32.0-1.el8_1.src.rpm
 8fff814901e03c2518ede2f8992d898f5ba61ed9 SOURCES/nss-3.67.0-7.el8_1.src.rpm
-7f97946153fe61dd7da01fdb3e2e367c7f24bcf5 SOURCES/thunderbird-91.8.0.processed-source.tar.xz
-23d8ffc635a34725c989f591cc074f329b8e35db SOURCES/thunderbird-langpacks-91.8.0-20220405.tar.xz
+e012b11182f73663668bd7f3ebe84acd6e51b44d SOURCES/thunderbird-91.9.0.processed-source.tar.xz
+7cc62140aef4a07dec14fcae4103f57e11859ec1 SOURCES/thunderbird-langpacks-91.9.0-20220503.tar.xz
diff --git a/SPECS/thunderbird.spec b/SPECS/thunderbird.spec
index e23078d..58925a9 100644
--- a/SPECS/thunderbird.spec
+++ b/SPECS/thunderbird.spec
@@ -19,7 +19,7 @@ function dist_to_rhel_minor(str, start)
   end
   match = string.match(str, ".el8")
   if match then
-     return 6
+     return 7
   end
   return -1
 end}
@@ -128,8 +128,8 @@ end}
 %global build_langpacks         1
 Summary:        Mozilla Thunderbird mail/newsgroup client
 Name:           thunderbird
-Version:        91.8.0
-Release:        1%{?dist}
+Version:        91.9.0
+Release:        3%{?dist}
 URL:            http://www.mozilla.org/projects/thunderbird/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
@@ -155,7 +155,7 @@ ExcludeArch:    s390 ppc
 # Link to official tarball: https://archive.mozilla.org/pub/thunderbird/releases/%%{version}%%{?pre_version}/source/thunderbird-%%{version}%%{?pre_version}.source.tar.xz
 Source0:        thunderbird-%{version}%{?pre_version}.processed-source.tar.xz
 %if %{build_langpacks}
-Source1:        thunderbird-langpacks-%{version}%{?ext_version}-20220405.tar.xz
+Source1:        thunderbird-langpacks-%{version}%{?ext_version}-20220503.tar.xz
 %endif
 Source2:        cbindgen-vendor.tar.xz
 Source3:        get-calendar-langpacks.sh
@@ -439,7 +439,7 @@ echo "use_rustts            %{?use_rustts}"
 %patch516 -p1 -b .expat-CVE-2022-25235
 %patch517 -p1 -b .expat-CVE-2022-25236
 %patch518 -p1 -b .expat-CVE-2022-25315
-#patch237 -p1 -b .disable-openpgp-in-thunderbird
+%patch237 -p1 -b .disable-openpgp-in-thunderbird
 
 
 %patch1001 -p1 -b .ppc64le-inline
@@ -1029,7 +1029,7 @@ rm -rf %{_prefix}/lib/debug/lib64/%{name}-devel-*
 
 
 # Removing librnp.so - we cannot deliver that in RHELs
-#{__rm} -rf %{buildroot}%{mozappdir}/librnp.so
+%{__rm} -rf %{buildroot}%{mozappdir}/librnp.so
 
 # Register as an application to be visible in the software center
 #
@@ -1133,6 +1133,15 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 #===============================================================================
 
 %changelog
+* Tue May 03 2022 Eike Rathke <erack@redhat.com> - 91.9.0-3
+- Update to 91.9.0 build3
+
+* Mon May 02 2022 Eike Rathke <erack@redhat.com> - 91.9.0-2
+- Update to 91.9.0 build2
+
+* Thu Apr 28 2022 Eike Rathke <erack@redhat.com> - 91.9.0-1
+- Update to 91.9.0
+
 * Tue Apr 05 2022 Eike Rathke <erack@redhat.com> - 91.8.0-1
 - Update to 91.8.0