diff --git a/firefox/MozillaFirefox.spec b/firefox/MozillaFirefox.spec
index 3e6e026..b6954a6 100644
--- a/firefox/MozillaFirefox.spec
+++ b/firefox/MozillaFirefox.spec
@@ -177,6 +177,13 @@ Patch18:        mozilla-s390-bigendian.patch
 Patch19:        mozilla-s390-context.patch
 Patch20:        mozilla-ppc-altivec_static_inline.patch
 Patch21:        mozilla-reduce-rust-debuginfo.patch
+Patch22:        mozilla-bmo1564900.patch
+Patch23:        mozilla-media-mime-type.patch
+Patch24:        mozilla-bmo1504834-part1.patch
+Patch25:        mozilla-bmo1504834-part2.patch
+Patch26:        mozilla-bmo1504834-part3.patch
+Patch27:        mozilla-bmo1511604.patch
+Patch28:        mozilla-bmo1554971.patch
 # Firefox/browser
 Patch101:       firefox-kde.patch
 Patch102:       firefox-branded-icons.patch
@@ -310,6 +317,15 @@ cd $RPM_BUILD_DIR/%{source_prefix}
 %endif
 %patch20 -p1
 %patch21 -p1
+%patch22 -p1
+%ifarch s390x
+%patch23 -p1
+%patch24 -p1
+%patch25 -p1
+%patch26 -p1
+%patch27 -p1
+%patch28 -p1
+%endif
 # Firefox
 %patch101 -p1
 %patch102 -p1
@@ -414,8 +430,14 @@ ac_add_options --enable-default-toolkit=cairo-gtk3
 %endif
 # gcc7 (boo#104105)
 %if 0%{?suse_version} > 1320
+%ifarch s390x
+# Possible bug in gcc: https://github.com/openSUSE/firefox-maintenance/issues/15
+# This is a mildly ugly workaround
+ac_add_options --enable-optimize="-g -O1"
+%else
 ac_add_options --enable-optimize="-g -O2"
 %endif
+%endif
 %ifarch %ix86 %arm aarch64
 %if 0%{?suse_version} > 1230
 ac_add_options --disable-optimize
diff --git a/firefox/mozilla-bmo1504834-part1.patch b/firefox/mozilla-bmo1504834-part1.patch
new file mode 120000
index 0000000..3933b4c
--- /dev/null
+++ b/firefox/mozilla-bmo1504834-part1.patch
@@ -0,0 +1 @@
+../mozilla-bmo1504834-part1.patch
\ No newline at end of file
diff --git a/firefox/mozilla-bmo1504834-part2.patch b/firefox/mozilla-bmo1504834-part2.patch
new file mode 120000
index 0000000..ec87803
--- /dev/null
+++ b/firefox/mozilla-bmo1504834-part2.patch
@@ -0,0 +1 @@
+../mozilla-bmo1504834-part2.patch
\ No newline at end of file
diff --git a/firefox/mozilla-bmo1504834-part3.patch b/firefox/mozilla-bmo1504834-part3.patch
new file mode 120000
index 0000000..3601891
--- /dev/null
+++ b/firefox/mozilla-bmo1504834-part3.patch
@@ -0,0 +1 @@
+../mozilla-bmo1504834-part3.patch
\ No newline at end of file
diff --git a/firefox/mozilla-bmo1511604.patch b/firefox/mozilla-bmo1511604.patch
new file mode 120000
index 0000000..ea9f347
--- /dev/null
+++ b/firefox/mozilla-bmo1511604.patch
@@ -0,0 +1 @@
+../mozilla-bmo1511604.patch
\ No newline at end of file
diff --git a/firefox/mozilla-bmo1554971.patch b/firefox/mozilla-bmo1554971.patch
new file mode 120000
index 0000000..3014348
--- /dev/null
+++ b/firefox/mozilla-bmo1554971.patch
@@ -0,0 +1 @@
+../mozilla-bmo1554971.patch
\ No newline at end of file
diff --git a/firefox/mozilla-bmo1564900.patch b/firefox/mozilla-bmo1564900.patch
new file mode 120000
index 0000000..e7def76
--- /dev/null
+++ b/firefox/mozilla-bmo1564900.patch
@@ -0,0 +1 @@
+../mozilla-bmo1564900.patch
\ No newline at end of file
diff --git a/firefox/mozilla-media-mime-type.patch b/firefox/mozilla-media-mime-type.patch
new file mode 120000
index 0000000..a499fe6
--- /dev/null
+++ b/firefox/mozilla-media-mime-type.patch
@@ -0,0 +1 @@
+../mozilla-media-mime-type.patch
\ No newline at end of file
diff --git a/WIP-s390x/mozilla-bmo1504834-part1.patch b/mozilla-bmo1504834-part1.patch
similarity index 100%
rename from WIP-s390x/mozilla-bmo1504834-part1.patch
rename to mozilla-bmo1504834-part1.patch
diff --git a/WIP-s390x/mozilla-bmo1504834-part2.patch b/mozilla-bmo1504834-part2.patch
similarity index 100%
rename from WIP-s390x/mozilla-bmo1504834-part2.patch
rename to mozilla-bmo1504834-part2.patch
diff --git a/WIP-s390x/mozilla-bmo1504834-part3.patch b/mozilla-bmo1504834-part3.patch
similarity index 100%
rename from WIP-s390x/mozilla-bmo1504834-part3.patch
rename to mozilla-bmo1504834-part3.patch
diff --git a/WIP-s390x/mozilla-bmo1511604.patch b/mozilla-bmo1511604.patch
similarity index 100%
rename from WIP-s390x/mozilla-bmo1511604.patch
rename to mozilla-bmo1511604.patch
diff --git a/WIP-s390x/mozilla-bmo1554971.patch b/mozilla-bmo1554971.patch
similarity index 100%
rename from WIP-s390x/mozilla-bmo1554971.patch
rename to mozilla-bmo1554971.patch
diff --git a/WIP-s390x/mozilla-media-mime-type.patch b/mozilla-media-mime-type.patch
similarity index 100%
rename from WIP-s390x/mozilla-media-mime-type.patch
rename to mozilla-media-mime-type.patch