diff --git a/srcpkgs/firefox/files/mozconfig b/srcpkgs/firefox/files/mozconfig
index c39294d49f5..9cb627d1645 100644
--- a/srcpkgs/firefox/files/mozconfig
+++ b/srcpkgs/firefox/files/mozconfig
@@ -2,6 +2,8 @@
 
 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
@@ -12,45 +14,26 @@ ac_add_options --with-system-libevent
 ac_add_options --with-system-libvpx
 ac_add_options --enable-system-hunspell
 ac_add_options --enable-system-sqlite
+ac_add_options --enable-system-ffi
 ac_add_options --enable-system-cairo
+ac_add_options --enable-system-pixman
 ac_add_options --with-pthreads
 
-ac_add_options --enable-default-toolkit=cairo-gtk2
-ac_add_options --enable-safe-browsing
-ac_add_options --enable-extensions=default
-ac_add_options --enable-startup-notification
-ac_add_options --enable-pango
-ac_add_options --enable-svg
-ac_add_options --enable-canvas
-ac_add_options --enable-smil
-ac_add_options --enable-canvas3d
-ac_add_options --enable-places
-ac_add_options --enable-url-classifier
-
-ac_add_options --enable-optimize
-ac_add_options --enable-strip
-ac_add_options --enable-install-strip
-ac_add_options --enable-jemalloc
-ac_add_options --enable-xterm-updates
-ac_add_options --enable-printing
-ac_add_options --enable-xinerama
+# Features
 ac_add_options --enable-official-branding
+ac_add_options --enable-safe-browsing
+ac_add_options --enable-startup-notification
+ac_add_options --enable-gio
 
-ac_add_options --disable-javaxpcom
+ac_add_options --disable-gnomevfs
 ac_add_options --disable-crashreporter
 ac_add_options --disable-updater
 ac_add_options --disable-tests
 ac_add_options --disable-mochitest
-ac_add_options --disable-debug
 ac_add_options --disable-installer
-ac_add_options --disable-pedantic
-ac_add_options --disable-static
 
-ac_add_options --enable-gio
-ac_add_options --disable-gnomevfs
-ac_add_options --enable-libnotify
+# Optimization
+ac_add_options --enable-optimize
 
-export BUILD_OFFICIAL=1
 export MOZILLA_OFFICIAL=1
-mk_add_options BUILD_OFFICIAL=1
 mk_add_options MOZILLA_OFFICIAL=1
diff --git a/srcpkgs/firefox/patches/firefox-install-dir.patch b/srcpkgs/firefox/patches/firefox-install-dir.patch
new file mode 100644
index 00000000000..0772ff0c496
--- /dev/null
+++ b/srcpkgs/firefox/patches/firefox-install-dir.patch
@@ -0,0 +1,26 @@
+--- config/autoconf.mk.in	2011-11-06 14:06:44.462920048 +0000
++++ config/autoconf.mk.in	2011-11-06 14:20:45.124169469 +0000
+@@ -68,8 +68,8 @@
+ mandir		= @mandir@
+ idldir		= $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+
+-installdir	= $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+-sdkdir		= $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
++installdir	= $(libdir)/$(MOZ_APP_NAME)
++sdkdir		= $(libdir)/$(MOZ_APP_NAME)-devel
+
+ DIST		= $(DEPTH)/dist
+ LIBXUL_SDK      = @LIBXUL_SDK@
+--- js/src/config/autoconf.mk.in	2011-11-06 14:06:45.586263727 +0000
++++ js/src/config/autoconf.mk.in	2011-11-06 14:21:01.770993669 +0000
+@@ -61,8 +61,8 @@
+ datadir		= @datadir@
+ mandir		= @mandir@
+
+-installdir	= $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+-sdkdir		= $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
++installdir	= $(libdir)/$(MOZ_APP_NAME)
++sdkdir		= $(libdir)/$(MOZ_APP_NAME)-devel
+
+ TOP_DIST	= @TOP_DIST@
+ ifneq (,$(filter /%,$(TOP_DIST)))
diff --git a/srcpkgs/firefox/patches/firefox-version.patch b/srcpkgs/firefox/patches/firefox-version.patch
deleted file mode 100644
index d924c425a66..00000000000
--- a/srcpkgs/firefox/patches/firefox-version.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur mozilla-release.orig/browser/installer/Makefile.in mozilla-release/browser/installer/Makefile.in
---- mozilla-release.orig/browser/installer/Makefile.in	2011-09-30 08:45:28.858668017 +0000
-+++ mozilla-release/browser/installer/Makefile.in	2011-09-30 08:51:01.548314685 +0000
-@@ -43,6 +43,8 @@
-
- include $(DEPTH)/config/autoconf.mk
-
-+MOZ_APP_VERSION=7.0
-+
- include $(topsrcdir)/config/rules.mk
-
- MOZ_PKG_REMOVALS = $(srcdir)/removed-files.in
diff --git a/srcpkgs/firefox/patches/mozilla-firefox-1.0-lang.patch b/srcpkgs/firefox/patches/mozilla-firefox-1.0-lang.patch
index f0f7325a547..2ab48aa75c0 100644
--- a/srcpkgs/firefox/patches/mozilla-firefox-1.0-lang.patch
+++ b/srcpkgs/firefox/patches/mozilla-firefox-1.0-lang.patch
@@ -1,5 +1,5 @@
---- mozilla/browser/app/profile/firefox.js.lang	2005-01-13 15:32:03.509282726 +0100
-+++ mozilla/browser/app/profile/firefox.js	2005-01-13 15:33:40.220914789 +0100
+--- browser/app/profile/firefox.js.lang	2005-01-13 15:32:03.509282726 +0100
++++ browser/app/profile/firefox.js	2005-01-13 15:33:40.220914789 +0100
 @@ -253,6 +253,9 @@
  pref("font.language.group", "chrome://global/locale/intl.properties");
  pref("intl.menuitems.alwaysappendaccesskeys","chrome://global/locale/intl.properties");
diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template
index ce288d0ced2..442dd37ae20 100644
--- a/srcpkgs/firefox/template
+++ b/srcpkgs/firefox/template
@@ -1,17 +1,13 @@
 # Template build file for 'firefox'.
 pkgname=firefox
-_majorver=7.0
-_minorver=1
-version=${_majorver}.${_minorver}
-revision=2
+version=8.0
 wrksrc=mozilla-release
-patch_args="-Np1"
-distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.bz2"
+distfiles="ftp://ftp.mozilla.org/pub/mozilla.org/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.bz2"
 short_desc="Lightweight gecko-based web browser"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.mozilla.org/projects/firefox"
 license="MPL-1.1, GPL-2, LGPL-2.1"
-checksum=81ecf63fca67186094d49dd5a6fe7f5dbd143a39f872ad126de38f246334fc04
+checksum=d950324ecd5362a648a891a66c3f2dde5e69b09f30ef8470b7759ec007691139
 long_desc="
  Mozilla Firefox is a free, open-source and cross-platform web browser
  for Windows, Linux, MacOS X and many other operating systems. It is
@@ -52,6 +48,7 @@ Add_dependency run libXt
 Add_dependency run startup-notification
 Add_dependency run libstdc++
 Add_dependency run libgcc
+Add_dependency run libffi
 Add_dependency run dbus-glib
 Add_dependency run libnotify
 Add_dependency run GConf
@@ -84,7 +81,7 @@ do_build() {
 	# Fix PRE_RELEASE_SUFFIX
 	sed -i '/^PRE_RELEASE_SUFFIX := ""/s/ ""//' browser/base/Makefile.in
 	cp -f ${FILESDIR}/mozconfig .mozconfig
-	export LDFLAGS="$XBPS_LDFLAGS -Wl,-R/usr/lib/firefox-${_majorver}"
+	export LDFLAGS="$XBPS_LDFLAGS -Wl,-R/usr/lib/firefox"
 	make -f client.mk MOZ_MAKE_FLAGS="${makejobs}"
 }
 
@@ -98,9 +95,8 @@ do_install() {
 	done
 
 	# We don't want the development stuff
-	rm -rf ${DESTDIR}/usr/{include,lib/firefox-devel-${_majorver},share/idl}
+	rm -rf ${DESTDIR}/usr/{include,lib/firefox-devel,share/idl}
 
 	# https://bugzilla.mozilla.org/show_bug.cgi?id=658850
-	ln -sf /usr/lib/firefox-${_majorver}/firefox-bin \
-		${DESTDIR}/usr/lib/firefox-${_majorver}/firefox
+	ln -sf firefox ${DESTDIR}/usr/lib/firefox/firefox-bin
 }