diff --git a/srcpkgs/chromium/template b/srcpkgs/chromium/template
index 31e1ba65f93..ed00939781d 100644
--- a/srcpkgs/chromium/template
+++ b/srcpkgs/chromium/template
@@ -1,46 +1,25 @@
 # Template file for 'chromium'
 pkgname=chromium
 #See http://www.chromium.org/developers/calendar for the latest version
-version=35.0.1916.153
+version=36.0.1985.125
 revision=1
 short_desc="Google's attempt at creating a safer, faster, and more stable browser"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.chromium.org/"
 license="BSD"
 
-_url_base="https://commondatastorage.googleapis.com"
-_toolchains_rev=12935
-
 lib32disabled=yes
 # XXX cannot be cross compiled right now, disabled for now.
 only_for_archs="i686 x86_64"
-
-distfiles="
- ${_url_base}/${pkgname}-browser-official/${pkgname}-${version}.tar.xz
- ${_url_base}/nativeclient-archive2/toolchain/${_toolchains_rev}/naclsdk_linux_x86.tgz
- ${_url_base}/nativeclient-archive2/toolchain/${_toolchains_rev}/naclsdk_pnacl_linux_x86.tgz
- ${_url_base}/nativeclient-archive2/toolchain/${_toolchains_rev}/naclsdk_pnacl_translator.tgz
- ${_url_base}/nativeclient-archive2/toolchain/${_toolchains_rev}/naclsdk_pnacl_translator.tgz.sha1hash"
-
-checksum="
- 280ceb4307ba334918aacd1c5672e6ce6538bf229f90415245ede5b569e5e70e
- 2d72245cf0fc5aec95dcf315d88d787aaeff85e2fae28b8521d60a3dd95e28d4
- 6baee05d11e353aac83a94125722d1f85c1aaa5fae0bfea55f996bd1d9c2a6eb
- 142108d8ce184c3e2b18126a01bed14e286f953d90897a6d1c97f2bf7802cc0a
- 67005b390ba80b736b48fb1511bdf3fccd8fc808f4928e7fcca69f5677148b83"
-
-skip_extraction="
- naclsdk_linux_x86.tgz
- naclsdk_pnacl_linux_x86.tgz
- naclsdk_pnacl_translator.tgz
- naclsdk_pnacl_translator.tgz.sha1hash"
+distfiles="https://commondatastorage.googleapis.com/${pkgname}-browser-official/${pkgname}-${version}.tar.xz"
+checksum=1782d0a5397e94313dee9e456de38bdfccf575c4e565f064a6ed7f9c509d5023
 
 hostmakedepends="which yasm python pkg-config perl gperf bison ninja clang llvm"
 makedepends="libpng-devel>=1.6 gtk+-devel nss-devel pciutils-devel
  libXi-devel libgcrypt-devel libgnome-keyring-devel cups-devel elfutils-devel
  libXcomposite-devel speech-dispatcher-devel libXrandr-devel mit-krb5-devel
  libXScrnSaver-devel alsa-lib-devel icu-devel protobuf-devel snappy-devel
- libxml2-devel libxslt-devel opus-devel pulseaudio-devel nss-devel
+ libxml2-devel libxslt-devel opus-devel pulseaudio-devel nss-devel libexif-devel
  libXcursor-devel libflac-devel speex-devel libmtp-devel libwebp-devel>=0.4.0
  libjpeg-turbo-devel libevent-devel json-c-devel re2-devel harfbuzz-devel
  minizip-devel jsoncpp-devel zlib-devel libcap-devel v8-devel>=3.24 hwids"
@@ -55,15 +34,9 @@ pre_configure() {
 	# XXX xtraeme: fix gcc{,-c++}-multilib instead.
 	ldconfig &>/dev/null
 
-	mkdir native_client/toolchain/{.tars,pnacl_translator}
-	ln -sf ${XBPS_SRCDISTDIR}/${pkgver%_*}/naclsdk_linux_x86.tgz \
-		native_client/toolchain/.tars/naclsdk_linux_x86.tgz
-	ln -sf ${XBPS_SRCDISTDIR}/${pkgver%_*}/naclsdk_pnacl_linux_x86.tgz \
-		native_client/toolchain/.tars/naclsdk_pnacl_linux_x86.tgz
-	ln -sf ${XBPS_SRCDISTDIR}/${pkgver%_*}/naclsdk_pnacl_translator.tgz \
-		native_client/toolchain/.tars/naclsdk_pnacl_translator.tgz
-	ln -sf ${XBPS_SRCDISTDIR}/${pkgver%_*}/naclsdk_pnacl_translator.tgz.sha1hash \
-		native_client/toolchain/pnacl_translator/SOURCE_SHA1
+	# Download NaCL toolchains
+	python2 build/download_nacl_toolchains.py \
+		--packages nacl_x86_newlib,pnacl_newlib,pnacl_translator
 
 	# Build with clang as a temporary solution to startup crash with GCC 4.9
 	mkdir -p third_party/llvm-build/Release+Asserts/bin
@@ -145,8 +118,8 @@ do_configure() {
 	# TODO: use the file at run time instead of effectively compiling it in.
 	conf+=" -Dusb_ids_path=/usr/share/hwdata/usb.ids"
 
-	# Never use bundled gold binary. Disable gold linker flags for now.
-	conf+=" -Dlinux_use_gold_binary=0 -Dlinux_use_gold_flags=0"
+	# Never use bundled binutils/gold binary. Disable gold linker flags for now.
+	conf+=" -Dlinux_use_bundled_binutils=0 -Dlinux_use_gold_binary=0 -Dlinux_use_gold_flags=0"
 
 	# Always support proprietary codecs.
 	conf+=" -Dproprietary_codecs=1"