diff --git a/srcpkgs/firefox/files/mozconfig b/srcpkgs/firefox/files/mozconfig
index 5cbce2c9d6..ac17cc10ed 100644
--- a/srcpkgs/firefox/files/mozconfig
+++ b/srcpkgs/firefox/files/mozconfig
@@ -42,11 +42,8 @@ ac_add_options --disable-strip
 ac_add_options --disable-profiling
 ac_add_options --enable-optimize="$CFLAGS"
 ac_add_options --enable-pie
-# https://bugzilla.mozilla.org/show_bug.cgi?id=1341234
-ac_add_options BINDGEN_CFLAGS="-I/usr/include/nspr -I/usr/include/pixman-1"
 # needed to enable stylo at runtime by default
 ac_add_options --enable-stylo
 
-ac_add_options --enable-release
 ac_add_options --enable-official-branding
 ac_add_options --enable-application=browser
diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template
index 199788b5e0..71d8cabbcc 100644
--- a/srcpkgs/firefox/template
+++ b/srcpkgs/firefox/template
@@ -1,7 +1,10 @@
 # Template build file for 'firefox'.
+#
+# THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/firefox-i18n".
+#
 pkgname=firefox
 version=59.0.2
-revision=1
+revision=2
 short_desc="Mozilla Firefox web browser"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
 homepage="https://www.mozilla.org/firefox/"
@@ -22,7 +25,7 @@ makedepends="nss-devel libjpeg-turbo-devel gtk+-devel gtk+3-devel icu-devel
  $(vopt_if startup_notification startup-notification-devel)
  $(vopt_if xscreensaver libXScrnSaver-devel)
  $(vopt_if sndio sndio-devel)"
-depends="nss>=3.33 desktop-file-utils hicolor-icon-theme"
+depends="nss>=3.35 desktop-file-utils hicolor-icon-theme"
 conflicts="firefox-esr>=0"
 
 build_options="alsa dbus pulseaudio startup_notification xscreensaver sndio"
@@ -55,9 +58,9 @@ do_build() {
 	esac
 
 	case "$XBPS_TARGET_MACHINE" in
-	x86_64-musl)
-		echo "ac_add_options --host=x86_64-unknown-linux-musl" >>.mozconfig
-		echo "ac_add_options --target=x86_64-unknown-linux-musl" >>.mozconfig
+	x86_64-musl|i686-musl)
+		echo "ac_add_options --host=${XBPS_TRIPLET}" >>.mozconfig
+		echo "ac_add_options --target=${XBPS_TRIPLET}" >>.mozconfig
 		;;
 	esac
 
@@ -108,7 +111,7 @@ do_install() {
 	vinstall ${FILESDIR}/vendor.js 644 usr/lib/firefox/browser/defaults/preferences
 	vinstall ${FILESDIR}/firefox.desktop 644 usr/share/applications
 
-	for i in 16x16 22x22 24x24 32x32 48x48 256x256; do
+	for i in 16x16 22x22 24x24 32x32 48x48 128x128 256x256; do
 		vinstall ${wrksrc}/browser/branding/official/default${i%x*}.png 644 \
 			usr/share/icons/hicolor/${i}/apps firefox.png
 	done