diff --git a/srcpkgs/firefox-esr/patches/patch-xpcom_components_Module.h b/srcpkgs/firefox-esr/patches/patch-xpcom_components_Module.h
new file mode 100644
index 00000000000..866c7b4a585
--- /dev/null
+++ b/srcpkgs/firefox-esr/patches/patch-xpcom_components_Module.h
@@ -0,0 +1,15 @@
+$NetBSD: patch-xpcom_components_Module.h,v 1.1 2016/02/06 22:13:22 ryoon Exp $
+
+* Workaround for binutils/GNU ld 2.26 from NetBSD/amd64 7.99.26
+
+--- xpcom/components/Module.h.orig	2016-01-23 23:23:51.000000000 +0000
++++ xpcom/components/Module.h
+@@ -125,7 +125,7 @@ struct Module
+ #    define NSMODULE_SECTION __declspec(allocate(".kPStaticModules$M"), dllexport)
+ #  elif defined(__GNUC__)
+ #    if defined(__ELF__)
+-#      define NSMODULE_SECTION __attribute__((section(".kPStaticModules"), visibility("protected")))
++#      define NSMODULE_SECTION __attribute__((section(".kPStaticModules"), visibility("default")))
+ #    elif defined(__MACH__)
+ #      define NSMODULE_SECTION __attribute__((section("__DATA, .kPStaticModules"), visibility("default")))
+ #    elif defined (_WIN32)
diff --git a/srcpkgs/firefox-esr/template b/srcpkgs/firefox-esr/template
index 5b43fa3a4ff..5d2808ae617 100644
--- a/srcpkgs/firefox-esr/template
+++ b/srcpkgs/firefox-esr/template
@@ -1,7 +1,7 @@
 # Template build file for 'firefox-esr'.
 pkgname=firefox-esr
 version=38.6.0
-revision=1
+revision=2
 wrksrc="mozilla-esr${version%%.*}"
 short_desc="Lightweight gecko-based web browser"
 maintainer="Eivind Uggedal <eivind@uggedal.com>"
@@ -10,6 +10,7 @@ license="MPL-1.1, GPL-2, LGPL-2.1"
 distfiles="${MOZILLA_SITE}/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.bz2"
 checksum=56244705572d25c5bdca111e814a6021bfe8eaefe3773646720e6e467e59e1d1
 
+only_for_archs="i686 i686-musl x86_64 x86_64-musl"
 nopie=yes
 lib32disabled=yes
 
@@ -23,9 +24,9 @@ makedepends="nss-devel libjpeg-turbo-devel libpng-devel
 depends="nss>=3.17 desktop-file-utils hicolor-icon-theme"
 conflicts="firefox>=0"
 
-case "$XBPS_TARGET_MACHINE" in
-	x86_64-musl) broken="http://build.voidlinux.eu/builders/x86_64-musl_builder/builds/8766/steps/shell_3/logs/stdio";;
-esac
+# https://bugzilla.mozilla.org/show_bug.cgi?id=1243724
+CFLAGS="-DBROTLI_BUILD_PORTABLE"
+CXXFLAGS="-DBROTLI_BUILD_PORTABLE"
 
 if [ "$CROSS_BUILD" ]; then
 	# Make config/system_wrappers/alsa/alsalib.h and pulse/pulse.h find