diff --git a/packages/mediacenter/service.openelec.settings/meta b/packages/mediacenter/service.openelec.settings/meta
index c86e51a44f..3a6a234a5f 100644
--- a/packages/mediacenter/service.openelec.settings/meta
+++ b/packages/mediacenter/service.openelec.settings/meta
@@ -34,3 +34,9 @@ PKG_LONGDESC="service.openelec.settings: is a settings dialog for OpenELEC"
 PKG_IS_ADDON="no"
 
 PKG_AUTORECONF="no"
+
+if [ "$DISPLAYSERVER" = "xorg-server" ]; then
+  PKG_DEPENDS="$PKG_DEPENDS setxkbmap"
+else
+  PKG_DEPENDS="$PKG_DEPENDS bkeymaps"
+fi
\ No newline at end of file
diff --git a/packages/sysutils/bkeymaps/build b/packages/sysutils/bkeymaps/build
new file mode 100755
index 0000000000..0ca72c8177
--- /dev/null
+++ b/packages/sysutils/bkeymaps/build
@@ -0,0 +1,23 @@
+#!/bin/sh
+
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
+#
+#  This Program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2, or (at your option)
+#  any later version.
+#
+#  This Program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+. config/options $1
diff --git a/packages/sysutils/bkeymaps/install b/packages/sysutils/bkeymaps/install
new file mode 100755
index 0000000000..73ad2ab6a6
--- /dev/null
+++ b/packages/sysutils/bkeymaps/install
@@ -0,0 +1,26 @@
+#!/bin/sh
+
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
+#
+#  This Program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2, or (at your option)
+#  any later version.
+#
+#  This Program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+. config/options $1
+
+mkdir -p $INSTALL/usr/lib/keymaps
+  cp -PR $PKG_BUILD/bkeymaps/* $INSTALL/usr/lib/keymaps
diff --git a/packages/sysutils/bkeymaps/meta b/packages/sysutils/bkeymaps/meta
new file mode 100644
index 0000000000..a804245b95
--- /dev/null
+++ b/packages/sysutils/bkeymaps/meta
@@ -0,0 +1,36 @@
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
+#
+#  This Program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2, or (at your option)
+#  any later version.
+#
+#  This Program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+PKG_NAME="bkeymaps"
+PKG_VERSION="1.13"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="GPL"
+PKG_SITE="http://www.alpinelinux.org"
+PKG_URL="http://dev.alpinelinux.org/archive/bkeymaps/$PKG_NAME-$PKG_VERSION.tar.gz"
+PKG_DEPENDS="busybox"
+PKG_BUILD_DEPENDS="toolchain"
+PKG_PRIORITY="optional"
+PKG_SECTION="system"
+PKG_SHORTDESC="bkeymaps: binary keyboard maps for busybox"
+PKG_LONGDESC="bkeymaps: binary keyboard maps for busybox"
+PKG_IS_ADDON="no"
+
+PKG_AUTORECONF="no"