diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template
index c9d952e6d2e..6b63c12766e 100644
--- a/srcpkgs/firefox/template
+++ b/srcpkgs/firefox/template
@@ -1,7 +1,7 @@
 # Template build file for 'firefox'.
 pkgname=firefox
 version=40.0.2
-revision=2
+revision=3
 wrksrc="mozilla-release"
 short_desc="Lightweight gecko-based web browser"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
@@ -69,10 +69,13 @@ do_configure() {
 	export LDFLAGS+=" -Wl,-rpath=/usr/lib/firefox"
 
 	cd xbps-build
+	# XXX build without --system-cairo. See:
+	# - https://github.com/voidlinux/void-packages/issues/2308#issuecomment-135426813
+	# - https://bugs.gentoo.org/show_bug.cgi?id=558150
 	SHELL=/bin/bash ../configure --prefix=/usr --libdir=/usr/lib \
 		--with-system-nspr --with-system-nss --with-system-bz2  \
 		--with-system-jpeg --with-system-zlib --without-system-png \
-		--with-system-libevent --with-system-libvpx --enable-system-cairo  \
+		--with-system-libevent --with-system-libvpx \
 		--enable-system-pixman --enable-system-hunspell --enable-system-sqlite \
 		--enable-system-ffi --enable-startup-notification --disable-gio \
 		--with-pthreads --enable-official-branding --enable-safe-browsing \
@@ -114,7 +117,4 @@ do_install() {
 
 	# https://bugzilla.mozilla.org/show_bug.cgi?id=658850
 	ln -sf firefox ${DESTDIR}/usr/lib/firefox/firefox-bin
-
-	echo '// https://github.com/voidlinux/void-packages/issues/2308' >> $DESTDIR/usr/lib/firefox/browser/defaults/preferences/vendor.js
-	echo 'pref("layers.offmainthreadcomposition.enabled", false);' >> $DESTDIR/usr/lib/firefox/browser/defaults/preferences/vendor.js
 }