diff --git a/device/testing/device-ouya-ouya/APKBUILD b/device/testing/device-ouya-ouya/APKBUILD
index 630497fea..a9010fded 100644
--- a/device/testing/device-ouya-ouya/APKBUILD
+++ b/device/testing/device-ouya-ouya/APKBUILD
@@ -2,12 +2,11 @@
 pkgname=device-ouya-ouya
 pkgver=1
 pkgdesc="Ouya"
-pkgrel=18
+pkgrel=19
 url="https://postmarketos.org"
 arch="armv7"
 license="MIT"
 options="!check !archcheck"
-# FIXME xf86-video-opentegra was removed because it doesn't build anymore, see postmarketOS/pmaports#339
 depends="
 	libvdpau-tegra
 	mesa-dri-swrast
@@ -19,6 +18,7 @@ subpackages="
 	$pkgname-nonfree-firmware:nonfree_firmware
 	$pkgname-kernel-downstream:kernel_downstream
 	$pkgname-kernel-mainline:kernel_mainline
+	$pkgname-x11
 	"
 source="
 	deviceinfo
@@ -57,6 +57,12 @@ kernel_mainline() {
 	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
 }
 
+x11() {
+	install_if="$pkgname xorg-server"
+	depends="xf86-video-opentegra"
+	mkdir "$subpkgdir"
+}
+
 sha512sums="6c1a33573dfdfda53c82a73bc5fba4b10ff0358dd4997e0dd3f89b7a2a94e25427663b0dd3159d99a12cc619e8e372ef7c77da8e6951bc5bd62a5444a60899a6  deviceinfo
 bf442fac4dc0594e055ed7a7d8232b5c884e2e77543273e8c4f32b5fe3c199561c86d8a5f665e17406057ca7863fabb93e789fe5e168fcd89d2982e0046232ad  fb.modes
 d01ac1f451275b1a269aab3c8f7fe20b482c952d00c4457ea496b45780c052f8ef98a5ba22a4af009ca128858374c1d3fb97e458102b09f7c40f3d7a718326c1  initfs-hook.sh