diff --git a/srcpkgs/firefox/files/mozconfig b/srcpkgs/firefox/files/mozconfig
deleted file mode 100644
index b379c4f1af..0000000000
--- a/srcpkgs/firefox/files/mozconfig
+++ /dev/null
@@ -1,44 +0,0 @@
-. $topsrcdir/browser/config/mozconfig
-
-ac_add_options --prefix=/usr
-ac_add_options --libdir=/usr/lib
-
-# System libraries
-ac_add_options --with-system-nspr
-ac_add_options --with-system-nss
-ac_add_options --with-system-jpeg
-ac_add_options --with-system-zlib
-ac_add_options --with-system-bz2
-# Use bundled libpng, our does not have the apng patch.
-ac_add_options --without-system-png
-ac_add_options --with-system-libevent
-ac_add_options --with-system-libvpx
-ac_add_options --enable-system-pixman
-ac_add_options --enable-system-hunspell
-ac_add_options --enable-system-sqlite
-ac_add_options --enable-system-ffi
-ac_add_options --enable-startup-notification
-ac_add_options --enable-gio
-
-# Features
-ac_add_options --with-pthreads
-ac_add_options --enable-official-branding
-ac_add_options --enable-safe-browsing
-ac_add_options --enable-skia
-
-ac_add_options --disable-system-cairo
-ac_add_options --disable-gnomevfs
-ac_add_options --disable-gconf
-ac_add_options --disable-crashreporter
-ac_add_options --disable-updater
-ac_add_options --disable-tests
-ac_add_options --disable-mochitest
-ac_add_options --disable-installer
-ac_add_options --disable-elf-hack
-ac_add_options --disable-debug
-
-# Optimization
-ac_add_options --enable-optimize
-
-export MOZILLA_OFFICIAL=1
-mk_add_options MOZILLA_OFFICIAL=1
diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template
index 9853c3e79c..cbc55a4715 100644
--- a/srcpkgs/firefox/template
+++ b/srcpkgs/firefox/template
@@ -1,7 +1,7 @@
 # Template build file for 'firefox'.
 pkgname=firefox
 version=29.0
-revision=1
+revision=2
 wrksrc=mozilla-release
 short_desc="Lightweight gecko-based web browser"
 maintainer="Juan RP <xtraeme@gmail.com>"
@@ -12,32 +12,77 @@ checksum=64402a1f1359f3ea30767a94977ae823ac25b39c6d54f9fe6db444ed127db892
 
 lib32disabled=yes
 
-hostmakedepends="unzip zip pkg-config perl python yasm"
+hostmakedepends="which unzip zip pkg-config perl python yasm"
 makedepends="nss-devel>=3.16 libjpeg-turbo-devel libpng-devel>=1.6
  pixman-devel sqlite-devel gst-plugins-base-devel gtk+-devel
  libevent-devel libnotify-devel libvpx-devel>1.3.0 libXrender-devel
  startup-notification-devel dbus-glib-devel alsa-lib-devel
- hunspell-devel>=1.3.2 libSM-devel libXScrnSaver-devel libXt-devel
- pulseaudio-devel alsa-plugins-pulseaudio"
-depends="nss>=3.16 desktop-file-utils hicolor-icon-theme alsa-plugins-pulseaudio"
+ hunspell-devel>=1.3.2 libSM-devel libXScrnSaver-devel libXt-devel"
+depends="nss>=3.16 desktop-file-utils hicolor-icon-theme"
 
-pre_build() {
+# Package build options
+build_options="pulseaudio"
+build_options_default="pulseaudio"
+desc_option_pulseaudio="Enable support for the PulseAudio sound server"
+
+if [ "$build_option_pulseaudio" ]; then
+	makedepends+=" pulseaudio-devel alsa-plugins-pulseaudio"
+	depends+=" alsa-plugins-pulseaudio"
+fi
+
+pre_configure() {
 	# Google API key (see http://www.chromium.org/developers/how-tos/api-keys)
 	# Note: This is for Void Linux use ONLY.
 	_google_api_key="AIzaSyCIFdBA7eQP43R6kXRwTq7j6Mvj1ITze90"
+	echo -n "$_google_api_key" > google-api-key
+	[ ! -d xbps-build ] && mkdir -p xbps-build
+}
 
-	echo -n "$_google_api_key" >google-api-key
-	cp -f ${FILESDIR}/mozconfig .mozconfig
-	echo "ac_add_options --with-google-api-keyfile=\"${wrksrc}/google-api-key\"" >>.mozconfig
+do_configure() {
+	if [ "$CROSS_BUILD" ]; then
+		export HOST_CFLAGS="${XBPS_CFLAGS}"
+		export HOST_CXXFLAGS="${XBPS_CXXFLAGS}"
+		export CFLAGS+=" -I${XBPS_CROSS_BASE}/usr/include/nspr -I${XBPS_CROSS_BASE}/usr/include/nss"
+		export CXXFLAGS+=" -I${XBPS_CROSS_BASE}/usr/include/nspr -I${XBPS_CROSS_BASE}/usr/include/nss"
+
+		cross_args+=" --target=$XBPS_CROSS_TRIPLET"
+		export ac_cv_sqlite_secure_delete=yes
+		export ac_cv_sqlite_threadsafe=yes
+		export ac_cv_sqlite_enable_fts3=yes
+		export ac_cv_sqlite_enable_unlock_notify=yes
+		export ac_cv_prog_hostcxx_works=1
+	fi
+
+	if [ "$build_option_pulseaudio" ]; then
+		args="--enable-pulseaudio"
+	else
+		args="--disable-pulseaudio"
+	fi
+
+	cd xbps-build
+	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  \
+		--enable-system-pixman --enable-system-hunspell --enable-system-sqlite \
+		--enable-system-ffi --enable-startup-notification --enable-gio \
+		--with-pthreads --enable-official-branding --enable-safe-browsing \
+		--enable-skia --disable-debug --disable-gnomevfs --disable-gconf \
+		--disable-crashreporter --disable-updater --disable-tests \
+		--disable-mochitest --disable-installer --disable-elf-hack \
+		--with-nspr-prefix=${XBPS_CROSS_BASE}/usr \
+		--with-nss-prefix=${XBPS_CROSS_BASE}/usr ${args} ${cross_args} \
+		--with-google-api-keyfile="${wrksrc}/google-api-key"
 }
 
 do_build() {
-	export LDFLAGS+=" -Wl,-R/usr/lib/firefox"
-	SHELL=/bin/bash HOME=/tmp make -f client.mk MOZ_MAKE_FLAGS="${makejobs}"
+	cd xbps-build
+	make ${makejobs} MOZ_MAKE_FLAGS="${makejobs}"
 }
 
 do_install() {
-	HOME=/tmp make -f client.mk DESTDIR=${DESTDIR} install
+	cd xbps-build
+	make DESTDIR=${DESTDIR} install
 
 	vinstall ${FILESDIR}/vendor.js 644 usr/lib/firefox/browser/defaults/preferences
 	vinstall ${FILESDIR}/firefox.desktop 644 usr/share/applications