diff --git a/.gitignore b/.gitignore
index 5146649..cc55744 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,7 @@
SOURCES/Python-2.7.13.tar.xz
SOURCES/gtk3-private-3.22.26-1.el6.src.rpm
SOURCES/libffi-3.0.13-18.el7_3.src.rpm
-SOURCES/lightning-langpacks-60.8.0.tar.xz
-SOURCES/thunderbird-60.8.0.source.tar.xz
-SOURCES/thunderbird-langpacks-60.8.0-20190704.tar.xz
+SOURCES/lightning-langpacks-60.9.0.tar.xz
+SOURCES/thunderbird-60.9.0.source.tar.xz
+SOURCES/thunderbird-langpacks-60.9.0-20190904.tar.xz
SOURCES/yasm-1.2.0-3.el5.src.rpm
diff --git a/.thunderbird.metadata b/.thunderbird.metadata
index 80418a2..24cf516 100644
--- a/.thunderbird.metadata
+++ b/.thunderbird.metadata
@@ -1,7 +1,7 @@
18a8f30a0356c751b8d0ea6f76e764cab13ee046 SOURCES/Python-2.7.13.tar.xz
0de63f863b158454b9429234b52ed28a397ec45c SOURCES/gtk3-private-3.22.26-1.el6.src.rpm
e188ab1a444697bc649e223c28389d82ca94c472 SOURCES/libffi-3.0.13-18.el7_3.src.rpm
-6bf54dcaae3e1bf1e7440f68e9146ddb13bb5356 SOURCES/lightning-langpacks-60.8.0.tar.xz
-f269436ebc3b10480cb2dd187a9b98605778ad0a SOURCES/thunderbird-60.8.0.source.tar.xz
-2e74ba8e7988a2678509b966ff996b2a6fd5bf19 SOURCES/thunderbird-langpacks-60.8.0-20190704.tar.xz
+fcd61b9db9e787b8891afbcf6be1efc50cc7b678 SOURCES/lightning-langpacks-60.9.0.tar.xz
+e2378df848679ecd80493e6c7fda6c2ab4258d3f SOURCES/thunderbird-60.9.0.source.tar.xz
+675a0dd3eb14c2069f7f407976575d1eab939c61 SOURCES/thunderbird-langpacks-60.9.0-20190904.tar.xz
77fd30f7ebc12a629a31c1e252cec06af55a71fe SOURCES/yasm-1.2.0-3.el5.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/build-rust-missing-docs.patch b/SOURCES/build-rust-missing-docs.patch
new file mode 100644
index 0000000..7789cb7
--- /dev/null
+++ b/SOURCES/build-rust-missing-docs.patch
@@ -0,0 +1,19 @@
+diff -up thunderbird-60.9.0/servo/components/style_traits/values.rs.rust-build thunderbird-60.9.0/servo/components/style_traits/values.rs
+--- thunderbird-60.9.0/servo/components/style_traits/values.rs.rust-build 2019-09-06 12:25:57.491129675 +0200
++++ thunderbird-60.9.0/servo/components/style_traits/values.rs 2019-09-06 12:27:54.698509544 +0200
+@@ -135,6 +135,7 @@ where
+ }
+ }
+
++/// Some dummy docs
+ #[macro_export]
+ macro_rules! serialize_function {
+ ($dest: expr, $name: ident($( $arg: expr, )+)) => {
+@@ -404,6 +405,7 @@ impl_to_css_for_predefined_type!(::csspa
+ impl_to_css_for_predefined_type!(::cssparser::Color);
+ impl_to_css_for_predefined_type!(::cssparser::UnicodeRange);
+
++/// Some dummy docs
+ #[macro_export]
+ macro_rules! define_css_keyword_enum {
+ (pub enum $name:ident { $($variant:ident = $css:expr,)+ }) => {
diff --git a/SPECS/thunderbird.spec b/SPECS/thunderbird.spec
index e4a178c..b29409d 100644
--- a/SPECS/thunderbird.spec
+++ b/SPECS/thunderbird.spec
@@ -91,7 +91,7 @@
Summary: Mozilla Thunderbird mail/newsgroup client
Name: thunderbird
-Version: 60.8.0
+Version: 60.9.0
Release: 1%{?dist}
URL: http://www.mozilla.org/projects/thunderbird/
License: MPLv1.1 or GPLv2+ or LGPLv2+
@@ -107,7 +107,7 @@ ExclusiveArch: i686 x86_64 ppc64 s390x
# 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}-20190704.tar.xz
+Source1: thunderbird-langpacks-%{version}%{?ext_version}-20190904.tar.xz
# Locales for lightning
Source2: lightning-langpacks-%{version}.tar.xz
%endif
@@ -151,6 +151,7 @@ Patch40: build-aarch64-skia.patch
Patch41: build-debug-qcms.patch
Patch43: xulrunner-24.0-jemalloc-ppc.patch
Patch45: build-disable-elfhack.patch
+Patch46: build-rust-missing-docs.patch
# Fedora/RHEL specific patches
Patch215: firefox-enable-addons.patch
@@ -338,6 +339,7 @@ Mozilla Thunderbird is a standalone mail and newsgroup client.
%if 0%{?rhel} == 8
%patch45 -p1 -b .elfhack
%endif
+%patch46 -p1 -b .build-rust-missing-docs
%patch3 -p1 -b .arm
%patch4 -p1 -b .build-mozconfig-fix
@@ -681,7 +683,7 @@ export MOZ_DEBUG_FLAGS=" "
%ifarch s390 %{arm} ppc aarch64 i686
MOZ_LINK_FLAGS="-Wl,--no-keep-memory -Wl,--reduce-memory-overheads"
%endif
-%ifarch %{arm}
+%ifarch %{arm} %{ix86}
export RUSTFLAGS="-Cdebuginfo=0"
%endif
export CFLAGS=$MOZ_OPT_FLAGS
@@ -987,6 +989,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
#===============================================================================
%changelog
+* Wed Sep 4 2019 Jan Horak <jhorak@redhat.com> - 60.9.0-1
+- Update to 60.9.0
+
* Thu Jul 4 2019 Martin Stransky <stransky@redhat.com> - 60.8.0-1
- Updated to 60.8.0