diff --git a/mozilla-1556931-s390x-hidden-syms.patch b/mozilla-1556931-s390x-hidden-syms.patch
new file mode 100644
index 0000000..c423d1f
--- /dev/null
+++ b/mozilla-1556931-s390x-hidden-syms.patch
@@ -0,0 +1,25 @@
+diff --git a/gfx/angle/checkout/src/compiler/translator/tree_util/IntermTraverse.cpp b/gfx/angle/checkout/src/compiler/translator/tree_util/IntermTraverse.cpp
+index c38baa12bffa8..2858a7bb4d319 100644
+--- a/gfx/angle/checkout/src/compiler/translator/tree_util/IntermTraverse.cpp
++++ b/gfx/angle/checkout/src/compiler/translator/tree_util/IntermTraverse.cpp
+@@ -45,16 +45,20 @@ void TIntermTraverser::traverse(T *node)
+             ++childIndex;
+         }
+ 
+         if (visit && postVisit)
+             node->visit(PostVisit, this);
+     }
+ }
+ 
++// Instantiate template for RewriteAtomicFunctionExpressions.
++template
++void TIntermTraverser::traverse(TIntermNode *);
++
+ void TIntermNode::traverse(TIntermTraverser *it)
+ {
+     it->traverse(this);
+ }
+ 
+ void TIntermSymbol::traverse(TIntermTraverser *it)
+ {
+     TIntermTraverser::ScopedNodeInTraversalPath addToPath(it, this);
diff --git a/thunderbird.spec b/thunderbird.spec
index 1a04a97..f60d21c 100644
--- a/thunderbird.spec
+++ b/thunderbird.spec
@@ -1,9 +1,6 @@
 # Disabled arm due to rhbz#1658940
 ExcludeArch: armv7hl
 
-# Disabled due to https://bugzilla.redhat.com/show_bug.cgi?id=1886672
-ExcludeArch: s390x
-
 # Use system nspr/nss?
 %define system_nss        1
 
@@ -19,10 +16,7 @@ ExcludeArch: s390x
 %global build_with_clang  0
 %global use_bundled_cbindgen  1
 
-%global disable_elfhack       0
-%if 0%{?fedora} > 28
 %global disable_elfhack       1
-%endif
 
 %if %{?system_nss}
 %global nspr_version 4.26.0
@@ -126,6 +120,7 @@ Patch307:       build-disable-elfhack.patch
 # Upstream patches
 Patch402:       mozilla-526293.patch
 Patch404:        rust-1.47.patch
+Patch405:        mozilla-1556931-s390x-hidden-syms.patch
 
 %if %{official_branding}
 # Required by Mozilla Corporation
@@ -267,6 +262,7 @@ debug %{name}, you want to install %{name}-debuginfo instead.
 
 %patch402 -p1 -b .526293
 %patch404 -p1 -b .rust-1.47
+%patch405 -p1 -b .1556931-s390x-hidden-syms
 
 %if %{official_branding}
 # Required by Mozilla Corporation