diff --git a/srcpkgs/firefox-esr/patches/rust-i686.patch b/srcpkgs/firefox-esr/patches/rust-i686.patch
new file mode 100644
index 00000000000..eee8bd4311c
--- /dev/null
+++ b/srcpkgs/firefox-esr/patches/rust-i686.patch
@@ -0,0 +1,16 @@
+ build/moz.configure/rust.configure | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git c/build/moz.configure/rust.configure i/build/moz.configure/rust.configure
+index cd86b24153debb1b..44911715e25d95e3 100644
+--- build/moz.configure/rust.configure
++++ build/moz.configure/rust.configure
+@@ -81,7 +81,7 @@ def rust_target(rust_compiler, rustc, target, cross_compiling):
+             # OpenBSD
+             ('x86_64', 'OpenBSD'): 'x86_64-unknown-openbsd',
+             # Linux
+-            ('x86', 'Linux'): 'i586-unknown-linux-gnu',
++            ('x86', 'Linux'): 'i686-unknown-linux-gnu',
+             # Linux
+             ('x86_64', 'Linux'): 'x86_64-unknown-linux-gnu',
+             # OS X and iOS
diff --git a/srcpkgs/firefox-esr/template b/srcpkgs/firefox-esr/template
index e7594c57a72..3bb9e3cc49a 100644
--- a/srcpkgs/firefox-esr/template
+++ b/srcpkgs/firefox-esr/template
@@ -3,15 +3,15 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/firefox-esr-i18n".
 #
 pkgname=firefox-esr
-version=52.7.3
+version=52.8.0
 revision=1
 wrksrc="firefox-${version}esr"
 short_desc="Mozilla Firefox web browser - Extended Support Release (ESR)"
 maintainer="Eivind Uggedal <eivind@uggedal.com>"
 homepage="https://www.mozilla.org/firefox/organizations/"
-license="MPL-2.0, GPL-2, LGPL-2.1"
+license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
 distfiles="${MOZILLA_SITE}/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz"
-checksum=5cc68c1a7486cfbbf02aec0e9da9f87b55e7bfc68c7d5139bc1e578441aaf19f
+checksum=babed4fe0ae95783e39358aedf7111b20fd9442f73b3b41b025fa4951fe76287
 
 lib32disabled=yes
 hostmakedepends="autoconf213 unzip zip pkg-config perl python yasm
@@ -32,7 +32,7 @@ build_options_default="alsa dbus gtk3 pulseaudio startup_notification xscreensav
 desc_option_rust="Build rust components"
 
 case "$XBPS_TARGET_MACHINE" in
-	x86_64*) build_options_default+=" rust";;
+	i686*|x86_64*) build_options_default+=" rust";;
 esac
 
 post_extract() {