diff --git a/community/bluegriffon/PKGBUILD b/community/bluegriffon/PKGBUILD
index 220f2c9cd..d4c52efee 100644
--- a/community/bluegriffon/PKGBUILD
+++ b/community/bluegriffon/PKGBUILD
@@ -11,7 +11,7 @@ highmem=1
 pkgname=bluegriffon
 pkgver=2.2
 _mozilla_ver=f14898695ee0
-pkgrel=1
+pkgrel=2
 pkgdesc="The next-generation Web Editor based on the rendering engine of Firefox"
 arch=('i686' 'x86_64')
 url="http://bluegriffon.org/"
@@ -23,6 +23,7 @@ options=('!emptydirs')
 source=("${pkgname}-${pkgver}.tar.gz"::"https://github.com/therealglazou/${pkgname}/archive/${pkgver}.tar.gz"
         "mozilla-central-${_mozilla_ver}.tar.bz2"::"https://hg.mozilla.org/mozilla-central/archive/${_mozilla_ver}.tar.bz2"
         "bug_1329272_icu.patch"::"https://hg.mozilla.org/releases/mozilla-esr45/raw-diff/571b48abf054/build/autoconf/icu.m4"
+        "bug_1290037_update_keybits_in_h2.patch"::"https://hg.mozilla.org/mozilla-central/raw-rev/361ac226da2a"
         "${pkgname}_gtk3.patch"
         "bug_1234158_firefox-gtk3-20.patch"
         "mozconfig"
@@ -31,6 +32,7 @@ source=("${pkgname}-${pkgver}.tar.gz"::"https://github.com/therealglazou/${pkgna
 sha256sums=('660efb0f6498e0a67b2410f24a6c09836e2005906f4a456150df9e9e031f9e17'
             '0b13213b5f9b3819b56872f7fb4fa7a1170ade06f8797dc11114e5f7c8eabca2'
             '93de8102de543bad38dc49d9ffcf7a8a2d9246594a8e7b92c38736ed6c6050cd'
+            '87fb92e45f161d47b9e3ca31bcce60555bc33d633116dab4baa3bfba6ad965c4'
             '3868f39181a258823c45e7ad62bba8e7b6e8b07c41535dd584c2dc71431f5deb'
             'd5e1b9a702dc693184494899fc4cd57ac206e1fd5415a8e5520b8ff3b822e734'
             '3c162de2bae884a573b2c1260500352e6b9c7803758cc73975109482503b9eb0'
@@ -38,19 +40,25 @@ sha256sums=('660efb0f6498e0a67b2410f24a6c09836e2005906f4a456150df9e9e031f9e17'
             'd0229aa67aa68dd50755fd022cf34af2a2a36faef2cf2ce06a336ebef7a08974')
 
 prepare() {
-  # Fix build with GTK+3
   cd "${pkgname}-${pkgver}"
-  patch -Np1 -i "../${pkgname}_gtk3.patch"
+
+  # Fix build with GTK+3
+  patch -Np1 -i "${srcdir}/${pkgname}_gtk3.patch"
 
   cd "${srcdir}/mozilla-central-${_mozilla_ver}"
+
   # https://bugzilla.mozilla.org/show_bug.cgi?id=1329272
-  patch -Np1 -i "../bug_1329272_icu.patch"
+  patch -Np1 -i "${srcdir}/bug_1329272_icu.patch"
+
+  # https://bugzilla.mozilla.org/show_bug.cgi?id=1290037
+  patch -Np1 -i "${srcdir}/bug_1290037_update_keybits_in_h2.patch"
+
   # Move files to their correct location
   cp -r "${srcdir}/${pkgname}-${pkgver}" bluegriffon
   cp "${srcdir}/mozconfig" .mozconfig
 
   # https://bugzilla.mozilla.org/show_bug.cgi?id=1234158
-  patch -Np1 -i "../bug_1234158_firefox-gtk3-20.patch"
+  patch -Np1 -i "${srcdir}/bug_1234158_firefox-gtk3-20.patch"
 
   # Apply BlueGriffon's upstream customizations
   patch -Np1 -i "bluegriffon/config/content.patch"