diff --git a/pkg/de-p1st-base-efi/PKGBUILD b/pkg/de-p1st-base-efi/PKGBUILD
index 8de31b2..a146283 100644
--- a/pkg/de-p1st-base-efi/PKGBUILD
+++ b/pkg/de-p1st-base-efi/PKGBUILD
@@ -17,12 +17,13 @@ depends+=('de-p1st-kernel')
 depends+=('de-p1st-pacman')
 # metapackage for microcode
 depends+=('de-p1st-ucode') !! TODO !!
+# bootmanager
+depends+=('de-p1st-grub' 'efibootmgr')
+# virtual console keyboard config
+depends+=('de-p1st-keyboard')
 
 # fonts
 depends+=('noto-fonts' 'ttf-material-design-icons-git' 'ttf-unifont')
-# bootmanager
-depends+=('de-p1st-grub' 'efibootmgr')
-depends+=('de-p1st-keyboard')
 
 optdepends=()
 provides=()
diff --git a/pkg/de-p1st-keyboard/00-keyboard.conf b/pkg/de-p1st-keyboard-x11/00-keyboard.conf
similarity index 100%
rename from pkg/de-p1st-keyboard/00-keyboard.conf
rename to pkg/de-p1st-keyboard-x11/00-keyboard.conf
diff --git a/pkg/de-p1st-keyboard-x11/PKGBUILD b/pkg/de-p1st-keyboard-x11/PKGBUILD
new file mode 100644
index 0000000..894eed8
--- /dev/null
+++ b/pkg/de-p1st-keyboard-x11/PKGBUILD
@@ -0,0 +1,30 @@
+# Maintainer: Daniel Langbein <daniel@systemli.org>
+_pkgname=keyboard-x11
+_reponame=arch-pkg
+pkgname="de-p1st-$_pkgname"
+pkgver=0.0.1
+pkgrel=1
+pkgdesc="xorg (X11) keyboard configuration"
+arch=('any')
+url="https://git.privacy1st.de/langfingaz/${_reponame}"
+license=('MIT')
+groups=()
+depends=()
+makedepends=('git')
+optdepends=()
+provides=()
+conflicts=()
+replaces=()
+backup=()
+options=()
+install=
+changelog=
+source=("git+${url}.git")
+noextract=()
+sha256sums=('SKIP')
+
+package() {
+  cd "${_reponame}/pkg/${pkgname}"
+
+  install -Dm0644 00-keyboard.conf "$pkgdir"/etc/X11/xorg.conf.d/00-keyboard.conf
+}
diff --git a/pkg/de-p1st-keyboard/PKGBUILD b/pkg/de-p1st-keyboard/PKGBUILD
index 7ac44e7..a72822a 100644
--- a/pkg/de-p1st-keyboard/PKGBUILD
+++ b/pkg/de-p1st-keyboard/PKGBUILD
@@ -4,7 +4,7 @@ _reponame=arch-pkg
 pkgname="de-p1st-$_pkgname"
 pkgver=0.0.1
 pkgrel=1
-pkgdesc="vconsole (virtual console) and xorg (X11) keyboard configuration"
+pkgdesc="vconsole (virtual console) keyboard configuration"
 arch=('any')
 url="https://git.privacy1st.de/langfingaz/${_reponame}"
 license=('MIT')
@@ -27,5 +27,4 @@ package() {
   cd "${_reponame}/pkg/${pkgname}"
 
   install -Dm0644 vconsole.conf    "$pkgdir"/etc/vconsole.conf
-  install -Dm0644 00-keyboard.conf "$pkgdir"/etc/X11/xorg.conf.d/00-keyboard.conf
 }