diff --git a/xorg/xkbcomp/build b/xorg/xkbcomp/build
new file mode 100755
index 00000000..6daf22f8
--- /dev/null
+++ b/xorg/xkbcomp/build
@@ -0,0 +1,7 @@
+#!/bin/sh -e
+
+./configure \
+    --prefix=/usr
+
+make
+make DESTDIR="$1" install
diff --git a/xorg/xkbcomp/checksums b/xorg/xkbcomp/checksums
new file mode 100644
index 00000000..8c8385c8
--- /dev/null
+++ b/xorg/xkbcomp/checksums
@@ -0,0 +1 @@
+6dd8bcb9be7e85bd7294abe261b8c7b0539d2fc93e41b80fb8bd013767ce8424  xkbcomp-1.4.2.tar.bz2
diff --git a/xorg/xkbcomp/depends b/xorg/xkbcomp/depends
new file mode 100644
index 00000000..6d64af8e
--- /dev/null
+++ b/xorg/xkbcomp/depends
@@ -0,0 +1,2 @@
+libX11     make
+libxkbfile make
diff --git a/xorg/xkbcomp/sources b/xorg/xkbcomp/sources
new file mode 100644
index 00000000..e089a15b
--- /dev/null
+++ b/xorg/xkbcomp/sources
@@ -0,0 +1 @@
+https://www.x.org/releases/individual/app/xkbcomp-1.4.2.tar.bz2
diff --git a/xorg/xkbcomp/version b/xorg/xkbcomp/version
new file mode 100644
index 00000000..4ff136af
--- /dev/null
+++ b/xorg/xkbcomp/version
@@ -0,0 +1 @@
+1.4.2 1
diff --git a/xorg/xkeyboard-config/build b/xorg/xkeyboard-config/build
new file mode 100755
index 00000000..abfcca36
--- /dev/null
+++ b/xorg/xkeyboard-config/build
@@ -0,0 +1,9 @@
+#!/bin/sh -e
+
+./configure \
+    --prefix=/usr \
+    --with-xkb-rules-symlink=xfree86,xorg \
+    --enable-compat-rules
+
+make
+make DESTDIR="$1" install
diff --git a/xorg/xkeyboard-config/checksums b/xorg/xkeyboard-config/checksums
new file mode 100644
index 00000000..abf8b980
--- /dev/null
+++ b/xorg/xkeyboard-config/checksums
@@ -0,0 +1 @@
+690daec8fea63526c07620c90e6f3f10aae34e94b6db6e30906173480721901f  xkeyboard-config-2.27.tar.bz2
diff --git a/xorg/xkeyboard-config/depends b/xorg/xkeyboard-config/depends
new file mode 100644
index 00000000..0f146e0c
--- /dev/null
+++ b/xorg/xkeyboard-config/depends
@@ -0,0 +1,2 @@
+libX11  make
+xkbcomp
diff --git a/xorg/xkeyboard-config/sources b/xorg/xkeyboard-config/sources
new file mode 100644
index 00000000..b3d46ed7
--- /dev/null
+++ b/xorg/xkeyboard-config/sources
@@ -0,0 +1 @@
+http://www.x.org/releases/individual/data/xkeyboard-config/xkeyboard-config-2.27.tar.bz2
diff --git a/xorg/xkeyboard-config/version b/xorg/xkeyboard-config/version
new file mode 100644
index 00000000..ffad7425
--- /dev/null
+++ b/xorg/xkeyboard-config/version
@@ -0,0 +1 @@
+2.27 1
diff --git a/xorg/xorg-server/depends b/xorg/xorg-server/depends
index 624d8e3e..fb6c28e4 100644
--- a/xorg/xorg-server/depends
+++ b/xorg/xorg-server/depends
@@ -1,8 +1,9 @@
-libepoxy   make
-libX11     make
-libXfont2  make
-libdrm     make
-libxkbfile make
-pixman     make
-mesa       make
-libressl   make
+libX11           make
+libXfont2        make
+libdrm           make
+libepoxy         make
+libressl         make
+libxkbfile       make
+mesa             make
+pixman           make
+xkeyboard-config make