diff --git a/.SRCINFO b/.SRCINFO
index bcc98c21b3f2e..7c422b859fe84 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = icecat
 	pkgdesc = GNU version of the Firefox browser.
 	pkgver = 45.5.1
-	pkgrel = 4
+	pkgrel = 5
 	url = http://www.gnu.org/software/gnuzilla/
 	install = icecat.install
 	arch = i686
@@ -20,6 +20,7 @@ pkgbase = icecat
 	makedepends = libpulse
 	makedepends = gst-plugins-base-libs
 	makedepends = inetutils
+	makedepends = cargo
 	depends = gtk2
 	depends = mozilla-common
 	depends = libxt
@@ -48,17 +49,15 @@ pkgbase = icecat
 	source = vendor.js
 	source = gcc6-fix-compilation-for-IceCat.patch
 	source = firefox-gcc-6.0.patch
-	source = mozilla-1228540-1.patch
 	validpgpkeys = A57369A8BABC2542B5A0368C3C76EED7D7E04784
 	sha256sums = 8163e5bc53f69d9f9b0fc5e9f95fae33da8139ae0f902756751cadbaa27e6ee9
 	sha256sums = SKIP
-	sha256sums = cafb2793d58f0298cf171b7f8745805cf72a1a6c1252451db5f0f630b95846c0
+	sha256sums = 0f9c8f4e7795ded4f661af9ff73a5b091fda4eebc969a76e00e48d005feebe7d
 	sha256sums = c44eab35f71dd3028a74632463710d674b2e8a0682e5e887535e3233a3b7bbb3
 	sha256sums = 190577ad917bccfc89a9bcafbc331521f551b6f54e190bb6216eada48dcb1303
 	sha256sums = 4b50e9aec03432e21b44d18c4c97b2630bace606b033f7d556c9d3e3eb0f4fa4
 	sha256sums = 329cf6753d29ae64a4336a8a76ee71f0d331a39132159401e4d11de65b708a07
 	sha256sums = 4d1e1ddabc9e975ed39f49e134559a29e01cd49439e358233f1ede43bf5a52bf
-	sha256sums = d1ccbaf0973615c57f7893355e5cd3a89efb4e91071d0ec376e429b50cf6ed19
 
 pkgname = icecat
 
diff --git a/PKGBUILD b/PKGBUILD
index daa794184d2e4..ee6f7a6844d18 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,7 +9,7 @@ pkgname=icecat
 pkgver=45.5.1
 _pkgver=${pkgver}-gnu1
 _pkgverbase=${pkgver%%.*}
-pkgrel=4
+pkgrel=5
 pkgdesc="GNU version of the Firefox browser."
 arch=(i686 x86_64)
 url="http://www.gnu.org/software/gnuzilla/"
@@ -18,7 +18,7 @@ depends=('gtk2' 'mozilla-common' 'libxt' 'startup-notification' 'mime-types'
          'dbus-glib' 'alsa-lib' 'ffmpeg' 'desktop-file-utils'
          'libvpx' 'icu' 'libevent' 'nss' 'hunspell' 'sqlite' 'ttf-font')
 makedepends=('unzip' 'zip' 'diffutils' 'python2' 'yasm' 'mesa' 'imake' 'gconf'
-             'libpulse' 'gst-plugins-base-libs' 'inetutils')
+             'libpulse' 'gst-plugins-base-libs' 'inetutils' 'cargo')
 optdepends=('networkmanager: Location detection via available WiFi networks'
             'upower: Battery API')
 options=('!emptydirs' '!makeflags')
@@ -32,18 +32,16 @@ source=(http://ftpmirror.gnu.org/gnuzilla/${pkgver}/${pkgname}-${_pkgver}.tar.bz
         icecat-safe.desktop
         vendor.js
         gcc6-fix-compilation-for-IceCat.patch
-        firefox-gcc-6.0.patch
-        mozilla-1228540-1.patch)
+        firefox-gcc-6.0.patch)
 
 sha256sums=('8163e5bc53f69d9f9b0fc5e9f95fae33da8139ae0f902756751cadbaa27e6ee9'
             'SKIP'
-            'cafb2793d58f0298cf171b7f8745805cf72a1a6c1252451db5f0f630b95846c0'
+            '0f9c8f4e7795ded4f661af9ff73a5b091fda4eebc969a76e00e48d005feebe7d'
             'c44eab35f71dd3028a74632463710d674b2e8a0682e5e887535e3233a3b7bbb3'
             '190577ad917bccfc89a9bcafbc331521f551b6f54e190bb6216eada48dcb1303'
             '4b50e9aec03432e21b44d18c4c97b2630bace606b033f7d556c9d3e3eb0f4fa4'
             '329cf6753d29ae64a4336a8a76ee71f0d331a39132159401e4d11de65b708a07'
-            '4d1e1ddabc9e975ed39f49e134559a29e01cd49439e358233f1ede43bf5a52bf'
-            'd1ccbaf0973615c57f7893355e5cd3a89efb4e91071d0ec376e429b50cf6ed19')
+            '4d1e1ddabc9e975ed39f49e134559a29e01cd49439e358233f1ede43bf5a52bf')
 
 validpgpkeys=(A57369A8BABC2542B5A0368C3C76EED7D7E04784) # Ruben Rodriguez (GNU IceCat releases key) <ruben@gnu.org>
 
@@ -59,9 +57,6 @@ prepare() {
   patch -Np1 -i $srcdir/gcc6-fix-compilation-for-IceCat.patch
   patch -Np1 -i $srcdir/firefox-gcc-6.0.patch
 
-  # Patch harfbuzz (following Thunderbird in [extra])
-  patch -Np1 -i $srcdir/mozilla-1228540-1.patch
-
   msg2 "Starting build..."
 
   cp -v ${srcdir}/mozconfig .mozconfig
diff --git a/mozconfig b/mozconfig
index ac8f1e7221656..05cc1fe4bc0a7 100644
--- a/mozconfig
+++ b/mozconfig
@@ -4,6 +4,7 @@ ac_add_options --prefix=/usr
 ac_add_options --libdir=/usr/lib
 ac_add_options --enable-gold
 ac_add_options --enable-pie
+ac_add_options --enable-rust
 ac_add_options --enable-official-branding
 ac_add_options --with-distribution-id=org.gnu
 
@@ -12,6 +13,7 @@ ac_add_options --with-system-nspr
 ac_add_options --with-system-nss
 ac_add_options --with-system-icu
 ac_add_options --with-system-jpeg
+ac_add_options --with-system-png
 ac_add_options --with-system-zlib
 ac_add_options --with-system-bz2
 ac_add_options --with-system-libevent
@@ -20,6 +22,7 @@ ac_add_options --enable-system-hunspell
 ac_add_options --enable-system-sqlite
 ac_add_options --enable-system-ffi
 ac_add_options --enable-system-pixman
+ac_add_options --enable-system-cairo
 
 # Features
 ac_add_options --enable-optimize --disable-debug
@@ -30,6 +33,8 @@ ac_add_options --disable-crashreporter
 ac_add_options --disable-installer
 ac_add_options --disable-telemetry
 ac_add_options --disable-debug-symbols
+ac_add_options --disable-tests
+ac_add_options --disable-eme
 
 ac_add_options --with-app-basename=icecat
 ac_add_options --with-app-name=icecat