diff --git a/kbd/PKGBUILD b/kbd/PKGBUILD
index a5a144e4b..b828b6f11 100644
--- a/kbd/PKGBUILD
+++ b/kbd/PKGBUILD
@@ -1,25 +1,26 @@
 #
 # Chakra Packages for Chakra, part of chakra-project.org
 #
-# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
 # maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
 
 pkgname=kbd
-pkgver=1.15.3
-pkgrel=2
+pkgver=1.15.5
+pkgrel=1
 pkgdesc="Keytable files and keyboard utilities"
-arch=('i686' 'x86_64')
-url="ftp://ftp.altlinux.org/pub/people/legion/kbd/"
+arch=('x86_64')
+url="http://www.kbd-project.org"
 license=('GPL')
-depends=('glibc')
+depends=('glibc' 'pam')
 source=(ftp://ftp.altlinux.org/pub/people/legion/kbd/${pkgname}-${pkgver}.tar.gz
-        fix-es.po.patch)
-md5sums=('8143e179a0f3c25646ce5085e8777200'
-         '4ded3edb50fb7a3277bae6a870cee812')
+        'fix-keymap-loading-1.15.5.patch')
+provides=('vlock')
+conflicts=('vlock')
+replaces=('vlock')
+md5sums=('34c71feead8ab9c01ec638acea8cd877'
+         '4362091d5e23bab2d158f8c7693a45d8')
 
 build() {
-  cd ${startdir}/src/${pkgname}-${pkgver}
-  patch -Np1 -i ../fix-es.po.patch
+  cd ${srcdir}/${pkgname}-${pkgver}
   # rename keymap files with the same names
   # this is needed because when only name of keymap is specified
   # loadkeys loads the first keymap it can find, which is bad (see FS#13837)
@@ -29,7 +30,10 @@ build() {
   mv data/keymaps/i386/olpc/pt{,-olpc}.map
   mv data/keymaps/i386/dvorak/no{,-dvorak}.map
   mv data/keymaps/i386/fgGIod/trf{,-fgGIod}.map
-
+  mv data/keymaps/i386/colemak/{en-latin9,colemak}.map
+  # fix https://bugs.archlinux.org/task/33308
+  # keymap loading is broken for cetain keymaps
+  patch -Np1 -i ../fix-keymap-loading-1.15.5.patch
   ./configure --prefix=/usr --datadir=/usr/share/kbd --mandir=/usr/share/man
   make KEYCODES_PROGS=yes RESIZECONS_PROGS=yes
 }
@@ -37,10 +41,4 @@ build() {
 package() {
   cd ${srcdir}/${pkgname}-${pkgver}
   make KEYCODES_PROGS=yes RESIZECONS_PROGS=yes DESTDIR=${pkgdir} install
-
-  # this is needed because initscripts call /bin/loadkeys
-  # remove this when next versions of kbd
-  # and initscripts with /usr/bin/loadkeys usage will be released
-  mkdir ${pkgdir}/bin
-  ln -s /usr/bin/loadkeys ${pkgdir}/bin/loadkeys
 }
diff --git a/kbd/fix-es.po.patch b/kbd/fix-es.po.patch
deleted file mode 100644
index 578f0a7b7..000000000
--- a/kbd/fix-es.po.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- kbd-1.15.3/po/es.old	2011-05-14 23:12:49.000000000 +0200
-+++ kbd-1.15.3/po/es.po	2011-05-15 21:07:02.120669404 +0200
-@@ -1363,7 +1363,7 @@
- #: src/setfont.c:682
- #, c-format
- msgid "Saved %d-char %dx%d font file on %s\n"
--msgstr "Se ha guardado el fichero de tipos %2$dx%3$d de %1$d caracteres en %s\n"
-+msgstr "Se ha guardado el fichero de tipos %dx%d de %d caracteres en %s\n"
- 
- #: src/setkeycodes.c:21
- #, c-format