diff --git a/device/downstream/device-asus-t00f/APKBUILD b/device/downstream/device-asus-t00f/APKBUILD
index 59a4d1d77..39eeca6ea 100644
--- a/device/downstream/device-asus-t00f/APKBUILD
+++ b/device/downstream/device-asus-t00f/APKBUILD
@@ -2,7 +2,7 @@
 pkgname=device-asus-t00f
 pkgdesc="Asus Zenfone 5"
 pkgver=4
-pkgrel=0
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="x86"
@@ -31,7 +31,7 @@ x11() {
 		xf86-input-libinput
 		xf86-video-fbdev"
 	install -Dm644 "$srcdir"/xorg.conf \
-		"$subpkgdir"/etc/X11/xorg.conf.d/10-t00f.conf
+		"$subpkgdir"/usr/share/X11/xorg.conf.d/10-t00f.conf
 }
 
 sha512sums="
diff --git a/device/downstream/device-clockworkpi-uconsole-rpi/APKBUILD b/device/downstream/device-clockworkpi-uconsole-rpi/APKBUILD
index 8f923a5ec..50921fde3 100644
--- a/device/downstream/device-clockworkpi-uconsole-rpi/APKBUILD
+++ b/device/downstream/device-clockworkpi-uconsole-rpi/APKBUILD
@@ -5,7 +5,7 @@ pkgdesc="Clockwork Tech ClockworkPi uConsole with Raspberry Pi compute modules"
 pkgver=9
 # commit to fork of kernel with drivers maintained by ak-rex
 _commit=d340a0416d34bf94591b45b50c5538aecbf5b09b
-pkgrel=0
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -144,7 +144,7 @@ nonfree_firmware() {
 x11() {
 	install_if="$pkgname xorg-server"
 	install -Dm644 "$srcdir"/xorg.conf \
-		"$subpkgdir"/etc/X11/xorg.conf.d/10-monitor.conf
+		"$subpkgdir"/usr/share/X11/xorg.conf.d/10-monitor.conf
 }
 
 openrc() {
diff --git a/device/downstream/device-lenovo-tb3-710i/APKBUILD b/device/downstream/device-lenovo-tb3-710i/APKBUILD
index 2ee70a840..9bb7e8293 100644
--- a/device/downstream/device-lenovo-tb3-710i/APKBUILD
+++ b/device/downstream/device-lenovo-tb3-710i/APKBUILD
@@ -3,7 +3,7 @@ maintainer="sreeranj <sreeranj1000@gmail.com>"
 pkgname=device-lenovo-tb3-710i
 pkgdesc="Lenovo Tab3 7"
 pkgver=2
-pkgrel=0
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -26,7 +26,8 @@ build() {
 
 package() {
 	devicepkg_package $startdir $pkgname
-	install -Dm644 "$srcdir"/00-fbdev-rotate.conf "$pkgdir"/etc/X11/xorg.conf.d/00-fbdev-rotate.conf
+	install -Dm644 "$srcdir"/00-fbdev-rotate.conf \
+		"$pkgdir"/usr/share/X11/xorg.conf.d/00-fbdev-rotate.conf
 }
 
 sha512sums="
diff --git a/device/downstream/device-planet-geminipda/APKBUILD b/device/downstream/device-planet-geminipda/APKBUILD
index 9a85a9ff0..9f606ed0e 100644
--- a/device/downstream/device-planet-geminipda/APKBUILD
+++ b/device/downstream/device-planet-geminipda/APKBUILD
@@ -2,13 +2,14 @@
 pkgname=device-planet-geminipda
 pkgdesc="Gemini PDA"
 pkgver=4
-pkgrel=0
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
 options="!check !archcheck"
 depends="postmarketos-base devicepkg-utils linux-planet-geminipda mkbootimg"
 makedepends="devicepkg-dev"
+subpackages="$pkgname-x11"
 source="deviceinfo
 	kernel-cmdline.conf
 	10-geminipda-loopback-device.sh
@@ -25,7 +26,14 @@ package() {
 		"$pkgdir"/usr/share/mkinitfs/hooks/10-geminipda-loopback-device.sh
 
 	install -Dm644 "$srcdir"/20-fbdev.conf \
-		"$pkgdir"/etc/X11/xorg.conf.d/20-fbdev.conf
+		"$pkgdir"/usr/share/X11/xorg.conf.d/20-fbdev.conf
+}
+
+x11() {
+	pkgdesc="$pkgdesc (x11 Configuration)"
+	install_if="$pkgname=$pkgver-r$pkgrel xorg-server"
+
+	amove usr/share/X11
 }
 
 sha512sums="
diff --git a/device/downstream/device-samsung-crownlte/APKBUILD b/device/downstream/device-samsung-crownlte/APKBUILD
index 4fb6f94d9..3b6078e56 100644
--- a/device/downstream/device-samsung-crownlte/APKBUILD
+++ b/device/downstream/device-samsung-crownlte/APKBUILD
@@ -2,7 +2,7 @@
 pkgname=device-samsung-crownlte
 pkgdesc="Samsung Galaxy Note 9"
 pkgver=4
-pkgrel=1
+pkgrel=2
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -65,7 +65,7 @@ x11() {
 	install_if="$pkgname=$pkgver-r$pkgrel xorg-server"
 	depends="xf86-input-evdev"
 	install -Dm644 "$srcdir"/stylus.conf \
-		-t "$subpkgdir"/etc/X11/xorg.conf.d
+		-t "$subpkgdir"/usr/share/X11/xorg.conf.d
 }
 
 sha512sums="
diff --git a/device/downstream/device-samsung-gtexswifi/APKBUILD b/device/downstream/device-samsung-gtexswifi/APKBUILD
index aff4a4210..1346c2f02 100644
--- a/device/downstream/device-samsung-gtexswifi/APKBUILD
+++ b/device/downstream/device-samsung-gtexswifi/APKBUILD
@@ -3,7 +3,7 @@ maintainer="19atlas <warfarin@vern.cc>"
 pkgname=device-samsung-gtexswifi
 pkgdesc="Samsung Galaxy Tab A 7.0"
 pkgver=3
-pkgrel=0
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -42,8 +42,8 @@ x11() {
 	install_if="$pkgname=$pkgver-r$pkgrel xorg-server"
 
 	# Touch fix
-	mkdir -p "$pkgdir"/etc/X11/xorg.conf.d
-	install -Dm644 "$srcdir"/00-fbdev-rotate-UD.conf "$subpkgdir"/etc/X11/xorg.conf.d
+	install -Dm644 "$srcdir"/00-fbdev-rotate-UD.conf \
+		-t "$subpkgdir"/usr/share/X11/xorg.conf.d
 }
 
 sha512sums="
diff --git a/device/downstream/device-samsung-santos10wifi/APKBUILD b/device/downstream/device-samsung-santos10wifi/APKBUILD
index 26b5560b6..0021d95a8 100644
--- a/device/downstream/device-samsung-santos10wifi/APKBUILD
+++ b/device/downstream/device-samsung-santos10wifi/APKBUILD
@@ -2,7 +2,7 @@
 pkgname=device-samsung-santos10wifi
 pkgdesc="Samsung Galaxy Tab 3 10.1 Wi-Fi"
 pkgver=4
-pkgrel=0
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="x86"
@@ -31,7 +31,7 @@ x11() {
 		xf86-input-libinput
 		xf86-video-fbdev"
 	install -Dm644 "$srcdir"/xorg.conf \
-		"$subpkgdir"/etc/X11/xorg.conf.d/10-santos10wifi.conf
+		"$subpkgdir"/usr/share/X11/xorg.conf.d/10-santos10wifi.conf
 }
 
 nonfree_firmware() {