diff --git a/srcpkgs/thunderbird/patches/musl-rust.configure.patch b/srcpkgs/thunderbird/patches/musl-rust.configure.patch
new file mode 100644
index 0000000000..d8f387136e
--- /dev/null
+++ b/srcpkgs/thunderbird/patches/musl-rust.configure.patch
@@ -0,0 +1,26 @@
+--- build/moz.configure/rust.configure	2019-10-28 12:05:04.930404603 +0700
++++ build/moz.configure/rust.configure	2019-10-28 12:09:42.742338957 +0700
+@@ -297,11 +297,20 @@
+                     suffix = 'hf'
+                 else:
+                     suffix = ''
++
++                narrowed = []
+                 for p in prefixes:
+                     for c in candidates:
+-                        if c.rust_target.startswith('{}-'.format(p)) and \
+-                                c.rust_target.endswith(suffix):
+-                            return c.rust_target
++                        if c.rust_target.startswith('{}-'.format(p)):
++                            narrowed.append(c.rust_target)
++
++                for target in narrowed:
++                    if target.endswith(host_or_target.raw_os):
++                        return target
++
++                for target in narrowed:
++                    if target.endswith(suffix):
++                        return target
+ 
+             # See if we can narrow down on the exact alias
+             narrowed = [c for c in candidates if c.target.alias == host_or_target.alias]
diff --git a/srcpkgs/thunderbird/template b/srcpkgs/thunderbird/template
index e921ae27fa..6db05bd70c 100644
--- a/srcpkgs/thunderbird/template
+++ b/srcpkgs/thunderbird/template
@@ -34,7 +34,6 @@ case $XBPS_TARGET_MACHINE in
 	armv6*) broken="required NEON extensions are not supported on armv6" ;;
 	ppc64*) ;;
 	ppc*) broken="xptcall bitrot" ;;
-	armv7l-musl) broken="https://build.voidlinux.org/builders/armv7l-musl_builder/builds/26107/steps/shell_3/logs/stdio";;
 esac
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then