diff --git a/device/testing/device-samsung-i927/APKBUILD b/device/testing/device-samsung-i927/APKBUILD
index 5f8e13b0f..967a826e0 100644
--- a/device/testing/device-samsung-i927/APKBUILD
+++ b/device/testing/device-samsung-i927/APKBUILD
@@ -2,12 +2,11 @@
 pkgname=device-samsung-i927
 pkgdesc="Samsung Captivate Glide"
 pkgver=0.3
-pkgrel=9
+pkgrel=10
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
 options="!check !archcheck"
-# FIXME xf86-video-opentegra was removed because it doesn't build anymore, see postmarketOS/pmaports#339
 depends="postmarketos-base
 	linux-samsung-i927
 	mkbootimg
@@ -17,7 +16,7 @@ depends="postmarketos-base
 	mesa-dri-swrast
 	libvdpau-tegra"
 makedepends="devicepkg-dev"
-subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
+subpackages="$pkgname-nonfree-firmware:nonfree_firmware $pkgname-x11"
 source="deviceinfo
 	modules-load.conf
 	HiFi.conf
@@ -66,6 +65,12 @@ nonfree_firmware() {
 	mkdir "$subpkgdir"
 }
 
+x11() {
+	install_if="$pkgname xorg-server"
+	depends="xf86-video-opentegra"
+	mkdir "$subpkgdir"
+}
+
 sha512sums="f6c3f8fd1deea112af77b71fee5a146ea9f3289d43ea09728cb66e11b2d9dec0d784c838c821eafd009d330fb70fc0278dda96c69b855bd887d6db90ca6722ad  deviceinfo
 d8ce60ea7acaabf627ddca2f0887a4cda46f313b7aaf7934bef2fef8a6e0798ccefab849e4571e4e3fcd06ae34c1a6efe3b58b401e2e443416f6200e6d4ea769  modules-load.conf
 97780fe04738a88afa2bc8bd96de5f053861d1ecb83185fc8af4534e77f365c0cbaaffdb2ee579aa0940db7ec3df74cbb90aa122d5fc97a2e3977432010f254f  HiFi.conf