diff --git a/extra/xulrunner/PKGBUILD b/extra/xulrunner/PKGBUILD
index 3c70a9053..9e0298571 100644
--- a/extra/xulrunner/PKGBUILD
+++ b/extra/xulrunner/PKGBUILD
@@ -8,13 +8,13 @@
 highmem=1
 
 pkgname=xulrunner
-pkgver=17.0.1
+pkgver=18.0
 pkgrel=1
 pkgdesc="Mozilla Runtime Environment"
 arch=('i686' 'x86_64')
 license=('MPL' 'GPL' 'LGPL')
-depends=('gtk2' 'mozilla-common' 'nss>=3.13.1' 'libxt' 'libxrender' 'hunspell' 'startup-notification' 'mime-types' 'dbus-glib' 'alsa-lib' 'libevent' 'sqlite>=3.7.4' 'libvpx' 'python2')
-makedepends=('zip' 'unzip' 'pkg-config' 'diffutils' 'wireless_tools' 'yasm' 'mesa' 'autoconf2.13')
+depends=('gtk2' 'mozilla-common' 'nss>=3.14.1' 'libxt' 'libxrender' 'hunspell' 'startup-notification' 'mime-types' 'dbus-glib' 'alsa-lib' 'libevent' 'sqlite>=3.7.4' 'libvpx' 'python2')
+makedepends=('zip' 'unzip' 'pkg-config' 'diffutils' 'yasm' 'mesa' 'autoconf2.13')
 url="http://wiki.mozilla.org/XUL:Xul_Runner"
 source=(ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/$pkgver/source/firefox-$pkgver.source.tar.bz2
         mozconfig
@@ -31,6 +31,12 @@ build() {
   patch -Np1 -i ../mozilla-pkgconfig.patch
   patch -Np1 -i ../shared-libs.patch
 
+  # WebRTC build tries to execute "python" and expects Python 2
+  # Workaround taken from chromium PKGBUILD
+  mkdir "$srcdir/python2-path"
+  ln -s /usr/bin/python2 "$srcdir/python2-path/python"
+  export PATH="$srcdir/python2-path:$PATH"
+
   export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/xulrunner-$pkgver"
   export PYTHON="/usr/bin/python2"
 
@@ -53,7 +59,7 @@ package() {
   sed -i 's|!/usr/bin/env python$|!/usr/bin/env python2|' \
     "$pkgdir"/usr/lib/xulrunner-devel-$pkgver/sdk/bin/{xpt,header,typelib,xpidl}.py
 }
-md5sums=('13d616028eb77de927c29b6655c832c9'
-         '37f005b4b0cf19d823193980b23d334c'
+md5sums=('485d02563854c20a3788d89db07b0687'
+         'ff653a78963f4801df788f4fc0a02867'
          '27271ce647a83906ef7a24605e840d61'
          '52e52f840a49eb1d14be1c0065b03a93')
diff --git a/extra/xulrunner/mozconfig b/extra/xulrunner/mozconfig
index a1b8a46f5..086f075e8 100644
--- a/extra/xulrunner/mozconfig
+++ b/extra/xulrunner/mozconfig
@@ -5,6 +5,7 @@ ac_add_options --libdir=/usr/lib
 
 # System libraries
 ac_add_options --disable-elf-hack
+ac_add_options --disable-webrtc
 ac_add_options --with-system-nspr
 ac_add_options --with-system-nss
 ac_add_options --with-system-jpeg
@@ -21,19 +22,9 @@ ac_add_options --enable-system-pixman
 ac_add_options --with-pthreads
 
 # Features
-ac_add_options --enable-safe-browsing
 ac_add_options --enable-startup-notification
-ac_add_options --enable-gio
 
-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-installer
-
-# Optimization
-ac_add_options --enable-optimize
-
-export MOZILLA_OFFICIAL=1
-mk_add_options MOZILLA_OFFICIAL=1