diff --git a/device/testing/device-pine64-pinenote/APKBUILD b/device/testing/device-pine64-pinenote/APKBUILD
index 2cf4ac092..7f9344f0a 100644
--- a/device/testing/device-pine64-pinenote/APKBUILD
+++ b/device/testing/device-pine64-pinenote/APKBUILD
@@ -40,6 +40,7 @@ subpackages="
 	$pkgname-nonfree-firmware-openrc:nonfree_firmware_openrc
 	$pkgname-nonfree-firmware-systemd:nonfree_firmware_systemd
 	$pkgname-phosh
+	$pkgname-x11
 "
 builddir="$srcdir"/pinenote-dist-$_commit
 
@@ -52,8 +53,6 @@ package() {
 
 	install -Dm644 "$srcdir"/local-overrides.quirks \
 		-t "$pkgdir"/etc/libinput/
-	install -Dm644 "$srcdir"/50-touchscreen.conf \
-		-t "$pkgdir"/etc/X11/xorg.conf.d
 	install -Dm644 "$srcdir"/81-libinput-pinenote.rules \
 		-t "$pkgdir"/usr/lib/udev/rules.d
 	install -Dm644 "$srcdir"/82-ebc-rockchip.rules \
@@ -114,6 +113,14 @@ nonfree_firmware_systemd() {
 		-t "$subpkgdir"/usr/lib/systemd/system
 }
 
+x11() {
+	install_if="$pkgname=$pkgver-r$pkgrel xorg-server"
+
+	# xorg touchscreen settings
+	install -Dm644 "$srcdir"/50-touchscreen.conf \
+		-t "$subpkgdir"/etc/X11/xorg.conf.d
+}
+
 sha512sums="
 4b6548a05dcdbe1ddda97dba58d625407fb553f90817e8e678b97e28603f64aab9a31fa18bda654c06638f3be21d7a6936786197f93f715e7d03a07e380873c5  pinenote-dist-28d2c05ab4e80a7972611cd3188f3e8be4197f6a.tar.gz
 780ece54589b4483461cc07917d9ca6f13222435872386d65c34ff6798758f28d81e913777d41b745e7bb0f53950b8f610ce361f2fe146937afd4080ae2aa904  waveform-extract-use-lib.patch