diff --git a/xorg/kbd/build b/xorg/kbd/build
new file mode 100755
index 00000000..b8fb7bf4
--- /dev/null
+++ b/xorg/kbd/build
@@ -0,0 +1,8 @@
+#!/bin/sh -e
+
+./configure \
+    --prefix=/usr \
+    --datadir=/usr/share/kbd
+
+make
+make DESTDIR="$1" install
diff --git a/xorg/kbd/checksums b/xorg/kbd/checksums
new file mode 100644
index 00000000..41aff956
--- /dev/null
+++ b/xorg/kbd/checksums
@@ -0,0 +1 @@
+84abb7fa2541af24d9c3b34bf75d6ac60cc94ac4410061bbb295b66a29221550  pixman-0.38.4.tar.bz2
diff --git a/xorg/kbd/depends b/xorg/kbd/depends
new file mode 100644
index 00000000..4aa53b61
--- /dev/null
+++ b/xorg/kbd/depends
@@ -0,0 +1,3 @@
+automake make
+libtool  make
+flex     make
diff --git a/xorg/kbd/sources b/xorg/kbd/sources
new file mode 100644
index 00000000..8dac2e9a
--- /dev/null
+++ b/xorg/kbd/sources
@@ -0,0 +1 @@
+https://www.x.org/releases/individual/utils/xkb-2.0.4.tar.bz2
diff --git a/xorg/kbd/version b/xorg/kbd/version
new file mode 100644
index 00000000..aaedf8d0
--- /dev/null
+++ b/xorg/kbd/version
@@ -0,0 +1 @@
+2.0.4 1
diff --git a/xorg/xorg-server/depends b/xorg/xorg-server/depends
index fb6c28e4..942a53a3 100644
--- a/xorg/xorg-server/depends
+++ b/xorg/xorg-server/depends
@@ -6,4 +6,5 @@ libressl         make
 libxkbfile       make
 mesa             make
 pixman           make
-xkeyboard-config make
+xkb
+xkeyboard-config