diff --git a/trunk/PKGBUILD b/trunk/PKGBUILD
index c087f94..86b0aaa 100644
--- a/trunk/PKGBUILD
+++ b/trunk/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=kbd
 pkgver=2.2.0
-pkgrel=3
+pkgrel=4
 pkgdesc="Keytable files and keyboard utilities"
 arch=('x86_64')
 url="http://www.kbd-project.org"
@@ -12,14 +12,12 @@ makedepends=('check' 'git')
 #source=(https://www.kernel.org/pub/linux/utils/${pkgname}/${pkgname}-${pkgver}.tar.gz
 #        https://www.kernel.org/pub/linux/utils/kbd/${pkgname}-${pkgver}.tar.sign
 source=(git+https://git.kernel.org/pub/scm/linux/kernel/git/legion/kbd.git#tag=v$pkgver
-        'fix-euro2.patch'
-        'kbd-fix-loadkmap-compat.patch')
+        'fix-euro2.patch')
 provides=('vlock')
 conflicts=('vlock')
 replaces=('vlock')
 md5sums=('SKIP'
-         'd869200acbc0aab6a9cafa43cb140d4e'
-         '730b1054fbd88b87c27c5565bd7d4fc6')
+         'd869200acbc0aab6a9cafa43cb140d4e')
 validpgpkeys=(
               '7F2A3D07298149A0793C9A4EA45ABA544CFFD434' #Alexey Gladkov 
              )
@@ -40,7 +38,8 @@ prepare() {
   git cherry-pick -n 15a74479 # Don't override CFLAGS
   git cherry-pick -n acf93e44 # https://github.com/legionus/kbd/issues/31
   git cherry-pick -n 7e27102b # https://github.com/legionus/kbd/issues/32
-  patch -p1 -i ../kbd-fix-loadkmap-compat.patch # Restore compatibility with busybox loadkmap
+  git cherry-pick -n 5b6df5cc # necessary for cherry-picking c994c776
+  git cherry-pick -n c994c776 # Restore compatibility with busybox loadkmap
   autoreconf -if
 }
 
@@ -52,10 +51,6 @@ build() {
 
 check() {
   cd ${pkgname}
-
-# This test is expected to fail since kbd-fix-loadkmap-compat.patch modifies the binary format
-  sed -e 's|dumpkeys-bkeymap ||' -i tests/Makefile
-
   make check
 }
 
diff --git a/trunk/kbd-fix-loadkmap-compat.patch b/trunk/kbd-fix-loadkmap-compat.patch
deleted file mode 100644
index 317cb5f..0000000
--- a/trunk/kbd-fix-loadkmap-compat.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/src/libkeymap/dump.c b/src/libkeymap/dump.c
-index 83ac351..a7ba1e5 100644
---- a/src/libkeymap/dump.c
-+++ b/src/libkeymap/dump.c
-@@ -72,7 +72,7 @@ int lk_dump_bkeymap(struct lk_ctx *ctx, FILE *fd)
- 			continue;
- 
- 		for (j = 0; j < NR_KEYS / 2; j++) {
--			int v = lk_get_key(ctx, i, j);
-+			short v = (short)lk_get_key(ctx, i, j);
- 
- 			if (fwrite(&v, sizeof(v), 1, fd) != 1)
- 				goto fail;
-