diff --git a/device-asus-grouper/APKBUILD b/device-asus-grouper/APKBUILD
index 7d91682c4..4326da429 100644
--- a/device-asus-grouper/APKBUILD
+++ b/device-asus-grouper/APKBUILD
@@ -1,6 +1,6 @@
 pkgname=device-asus-grouper
 pkgver=1
-pkgrel=2
+pkgrel=3
 pkgdesc="Asus Nexus 7 2012 Wifi"
 url="https://github.com/postmarketOS"
 arch="noarch"
@@ -25,6 +25,6 @@ package() {
 		"$pkgdir"/etc/udev/rules.d/90-android-touch-dev.rules
 }
 
-sha512sums="dcd9e938578d34f9fba7a18bbc7cc6a8707bdf0f08caa82d70a4ff0421e4035a99892d329ea7eed7cd048eb9fa4dc000bbb6c61d551ae29f14f7008a8dfc01e1  deviceinfo
+sha512sums="e77cd58f623fed83983757b11849adcbe9d669a9167e1664c84a0ab043f1c9afde30da29c9d2dc5b05e0ff07458a28ed8f3eaf22768d1575fe7218157501171a  deviceinfo
 8590967fa10388a890fdfafdb1070b9ab22dc89e06a3a8834806c772191e3b67de7b914b0d68e5ddf581cee715cb90f3f24abcb8762c415ff328c6da23e55d52  initfs-hook.sh
 05f938784e8f30cdbe9923a5f3e34ce7c539060d3a621741206bc5ed02afd7cbf480b02fbe48a70968e7182f885ab9bfe57c4d1e7c6eefca54a6f7188d2849f2  90-android-touch-dev.rules"
diff --git a/device-asus-grouper/deviceinfo b/device-asus-grouper/deviceinfo
index a48d4534b..f6cf9156d 100644
--- a/device-asus-grouper/deviceinfo
+++ b/device-asus-grouper/deviceinfo
@@ -22,3 +22,5 @@ deviceinfo_flash_offset_ramdisk="0x01000000"
 deviceinfo_flash_offset_second="0x00f00000"
 deviceinfo_flash_offset_tags="0x00000100"
 deviceinfo_flash_pagesize="2048"
+
+deviceinfo_weston_core_modules="xwayland.so"
diff --git a/device-htc-bravo/APKBUILD b/device-htc-bravo/APKBUILD
index 168fbf6c2..b7209105d 100644
--- a/device-htc-bravo/APKBUILD
+++ b/device-htc-bravo/APKBUILD
@@ -1,6 +1,6 @@
 pkgname=device-htc-bravo
 pkgver=1
-pkgrel=1
+pkgrel=2
 pkgdesc="HTC Desire"
 url="https://github.com/postmarketOS"
 arch="noarch"
@@ -29,6 +29,6 @@ package() {
 		"$pkgdir"/etc/udev/rules.d/90-android-touch-dev.rules
 }
 
-sha512sums="50e66e8aaefb4b88662fa734c9d8e954086e158a7f46a2c7184902260f288a6d37687131069dc8ba1783455ff4dae68b938a070b3740355215a1bf09232a97e7  deviceinfo
+sha512sums="601a7244a97795a4c9abeeb00df592f1674ab40eace20d0ea5db4f9eb1528638fd89ea02ac7ac7d390100fdb948f7c46881ea4f8d23e0e5979248ad4db6ac666  deviceinfo
 3ce2d134aa59677e25a160b5985c552fbf048b237169bbeb85e2b8824f734627064b51c097036db10eee0254064d45d804d17372dffcd1ba246938968fe1e225  initfs-hook.sh
 24c8e20cca7d9cff33fe6bac641d0dd4a15d011dd0dbbf1cb1309b11574e6ae7945f4e719646def1a5ba6e8f9607605fcea4a572aa71deb6aaff8498b722cb9d  90-android-touch-dev.rules"
diff --git a/device-htc-bravo/deviceinfo b/device-htc-bravo/deviceinfo
index 24360371e..5283cc1d4 100644
--- a/device-htc-bravo/deviceinfo
+++ b/device-htc-bravo/deviceinfo
@@ -24,3 +24,6 @@ deviceinfo_flash_offset_second="0x00f00000"
 deviceinfo_flash_offset_tags="0x00000100"
 deviceinfo_flash_cmdline=""
 deviceinfo_flash_pagesize="2048"
+
+deviceinfo_weston_core_modules="xwayland.so"
+
diff --git a/device-lg-d855/APKBUILD b/device-lg-d855/APKBUILD
index 5ff8d8a87..b396dc42a 100644
--- a/device-lg-d855/APKBUILD
+++ b/device-lg-d855/APKBUILD
@@ -1,6 +1,6 @@
 pkgname=device-lg-d855
 pkgver=1
-pkgrel=5
+pkgrel=6
 pkgdesc="LG G3 International"
 url="https://github.com/postmarketOS"
 arch="noarch"
@@ -23,5 +23,5 @@ package() {
 		"$pkgdir"/etc/udev/rules.d/90-android.rules
 }
 
-sha512sums="94641409bdc19ffdba32b4a162c81a76d814221f61591558fa1ab439db6e37f7b7c199347dece6873bc266cb34e5623140621fee926781035d64b5011f90638f  deviceinfo
+sha512sums="56f1cee43d536797fb32c34d53e5a99c09cccdde03030b02021333e6fdfd48a6e6ec7acc0ec1b06d16e7a6fd8c2d097d47e2c442f337c554b8024a172369b979  deviceinfo
 ee25f3d0377f027d108593eb7953b8db49d7f05a5c36a0c8ca7e7849d15e3c217bc1ac97d77a66e28d2db4b81c0f50b905639911276da40321d2b6cca7f797df  90-android.rules"
diff --git a/device-lg-d855/deviceinfo b/device-lg-d855/deviceinfo
index e13d0bddd..f68c36ce0 100644
--- a/device-lg-d855/deviceinfo
+++ b/device-lg-d855/deviceinfo
@@ -24,3 +24,5 @@ deviceinfo_flash_pagesize="2048"
 
 # Weston red screen workaround (see issue #54)
 deviceinfo_weston_pixman_type="2"
+deviceinfo_weston_core_modules="xwayland.so"
+
diff --git a/device-nokia-rx51/APKBUILD b/device-nokia-rx51/APKBUILD
index 64678ebca..9ee112942 100644
--- a/device-nokia-rx51/APKBUILD
+++ b/device-nokia-rx51/APKBUILD
@@ -1,6 +1,6 @@
 pkgname=device-nokia-rx51
 pkgver=1
-pkgrel=7
+pkgrel=8
 pkgdesc="Nokia N900"
 url="https://github.com/postmarketOS"
 arch="noarch"
@@ -33,7 +33,7 @@ package() {
                 "$pkgdir"/etc/acpi.map
 }
 
-sha512sums="7eb602ae1f6002a928f2a5cf12edf21ffe76e6e378907f73da6b6df98016bf5f3e256f93a4187a354069631f283a2f0769b5acf05445e42d8f630966b36dfa6b  deviceinfo
+sha512sums="90239ee58c3eadd08ab171ad8a73a1be1ea1416bbe8a29bc8b959831bbe23bbb93a59f8dff8ea8780578c1238b9e89859c4d427ac1970ac7b16a44c3293ba747  deviceinfo
 36fdcdc32e75ad82402d7f8dc6ec5879002513b3552ae4cf755df52f2c3df7b12c3ab0aae8ea8207a7fa22240b88f8098fd283298d08f923f9b07b7964289b83  uboot-script.cmd
 3d55e34b95791636e44a5f41754f3d0de039dbba41f7a556d43a95c9e64afcfa930046b4b96b40020b6f196096ffba93514682927e32fa4488686fdd19c6da5a  backlight-enable.sh
 98c554a709d6e8da5835bd792d833355d830fca1cfea12ec7fe4f41d1d1126389c51a8a392a7f94093473c19263cc6846cc40d7e179c2facf12db2d68ff923f9  90-touchscreen-dev.rules
diff --git a/device-nokia-rx51/deviceinfo b/device-nokia-rx51/deviceinfo
index 2480a8268..884bdf777 100644
--- a/device-nokia-rx51/deviceinfo
+++ b/device-nokia-rx51/deviceinfo
@@ -14,3 +14,6 @@ deviceinfo_external_disk_install="true"
 deviceinfo_flash_methods="0xFFFF"
 deviceinfo_generate_legacy_uboot_initfs="true"
 deviceinfo_arch="armhf"
+
+deviceinfo_weston_core_modules="xwayland.so"
+
diff --git a/device-samsung-i9070/APKBUILD b/device-samsung-i9070/APKBUILD
index 77b023720..ee652f5d8 100644
--- a/device-samsung-i9070/APKBUILD
+++ b/device-samsung-i9070/APKBUILD
@@ -1,6 +1,6 @@
 pkgname=device-samsung-i9070
 pkgver=1
-pkgrel=6
+pkgrel=7
 pkgdesc="Samsung Galaxy S Advance"
 url="https://github.com/postmarketOS"
 arch="noarch"
@@ -32,7 +32,7 @@ package() {
 		"$pkgdir"/etc/modules-load.d/00-${pkgname}.conf
 }
 
-sha512sums="352d7778a6ae6b19e10aed8506c074510c9b504f31bbd447f295c14a3baa7dd809b2d425ef2f20ff1be631a6d9e2189b0f10f8083c92f43808c523591c43cc8d  deviceinfo
+sha512sums="1e37746f2d6357eb04e1af2e1e53f198ead1280cc8a785265877f274ad74421ee64510fbd2e32db56331867e1cd203396222e243bbab728539fb4e28717d8841  deviceinfo
 098187f6ab56d2542f98f1b5fbcf493431f665a4300db05e859357366e39b02a3d508bfd94c1d1bd7c669261e7ef0d4e1aef1fdbb15541fe34f3f48a6caa247f  initfs-hook.sh
 ffa8ba47539f0b4a931c560811d7842c7f5270631066c270322859c1ef77e63fba09a8462c2533bd6d095056b2c7936c2d4fc4e225f3cff45169f121bf93d8ed  90-android.rules
 61e8becbf6fa7c1c6c42e481083f5981ae7af33a48cbc53e817d8ac2c6a8e4f67a54b32ae3b8f5f25f7b412165a849dc93a629110dc47b0d16927bf2a12eb7e1  modules-load.conf"
diff --git a/device-samsung-i9070/deviceinfo b/device-samsung-i9070/deviceinfo
index df11c4c1b..e629f9c56 100644
--- a/device-samsung-i9070/deviceinfo
+++ b/device-samsung-i9070/deviceinfo
@@ -17,3 +17,6 @@ deviceinfo_arch="armhf"
 # Heimdall related
 deviceinfo_flash_heimdall_partition_kernel="Kernel"
 deviceinfo_flash_heimdall_partition_initfs="Kernel2"
+
+deviceinfo_weston_core_modules="xwayland.so"
+
diff --git a/device-samsung-i9100/APKBUILD b/device-samsung-i9100/APKBUILD
index 0c8c1bb34..473aa79df 100644
--- a/device-samsung-i9100/APKBUILD
+++ b/device-samsung-i9100/APKBUILD
@@ -1,6 +1,6 @@
 pkgname=device-samsung-i9100
 pkgver=1
-pkgrel=5
+pkgrel=6
 pkgdesc="Samsung Galaxy SII"
 url="https://github.com/postmarketOS"
 arch="noarch"
@@ -23,5 +23,5 @@ package() {
 		"$pkgdir"/etc/udev/rules.d/90-android.rules
 }
 
-sha512sums="7d57cbeeb4d35c5e3ea865175b781eebf88508893607b1be883c615f56bb69eb73a979d97e698d1938fcc226e3836d1f7210e9d09bad0ad66671cba5faa37cdc  deviceinfo
+sha512sums="894ab32ef0751510853bd9b05ee7442d8fd9e9109dce816b93a33b623e331d38c69ecbfe49da0051e86acc49a14c20783d1a7b6e17e6258b5904aac7efbc7ec4  deviceinfo
 8aead706ddb118a44de7d049f07d10a27e727d17724058d132e4ec4fa73fed29c9ccfe03f02aca459c922ec0fbba24e171fe3c76e33f7c5462631e3dd5506e36  90-android.rules"
diff --git a/device-samsung-i9100/deviceinfo b/device-samsung-i9100/deviceinfo
index 14ba2c064..865e2462b 100644
--- a/device-samsung-i9100/deviceinfo
+++ b/device-samsung-i9100/deviceinfo
@@ -17,3 +17,6 @@ deviceinfo_arch="armhf"
 # Heimdall related
 deviceinfo_flash_heimdall_partition_kernel="KERNEL"
 deviceinfo_flash_heimdall_partition_initfs="RECOVERY"
+
+deviceinfo_weston_core_modules="xwayland.so"
+
diff --git a/device-samsung-maguro/APKBUILD b/device-samsung-maguro/APKBUILD
index 442c8be3d..eff10b939 100644
--- a/device-samsung-maguro/APKBUILD
+++ b/device-samsung-maguro/APKBUILD
@@ -1,6 +1,6 @@
 pkgname=device-samsung-maguro
 pkgver=2
-pkgrel=5
+pkgrel=6
 pkgdesc="Google Galaxy Nexus (GSM)"
 url="https://github.com/postmarketOS"
 arch="noarch"
@@ -21,4 +21,4 @@ package() {
 		"$pkgdir"/etc/deviceinfo
 }
 
-sha512sums="3c807dbb8c9879fe0722e267e0858c61429abf6214a195032ae05d6933c22355adcc0f0ef1413aa3defdde4ab8c2d5c6d2ed9470c654a6cccc26b4b5b86a92bf  deviceinfo"
+sha512sums="8cb5c6f992fc882baea31492d11c159187637d48400e581211c8dc796740b4cdbcfdec12d481b87c61c4df482d52366b47d944babd933dd6cc4d515ec9bb5310  deviceinfo"
diff --git a/device-samsung-maguro/deviceinfo b/device-samsung-maguro/deviceinfo
index 0c0e2ffe2..5e025e825 100644
--- a/device-samsung-maguro/deviceinfo
+++ b/device-samsung-maguro/deviceinfo
@@ -21,3 +21,6 @@ deviceinfo_flash_offset_ramdisk="0x01000000"
 deviceinfo_flash_offset_second="0x00f00000"
 deviceinfo_flash_offset_tags="0x00000100"
 deviceinfo_flash_pagesize="2048"
+
+deviceinfo_weston_core_modules="xwayland.so"
+
diff --git a/device-sony-amami/APKBUILD b/device-sony-amami/APKBUILD
index 69f90ed48..26c57498e 100644
--- a/device-sony-amami/APKBUILD
+++ b/device-sony-amami/APKBUILD
@@ -1,6 +1,6 @@
 pkgname=device-sony-amami
 pkgver=1
-pkgrel=4
+pkgrel=5
 pkgdesc="Sony Xperia Z1 Compact"
 url="https://github.com/postmarketOS"
 arch="noarch"
@@ -23,5 +23,5 @@ package() {
 		"$pkgdir"/etc/udev/rules.d/90-android.rules
 }
 
-sha512sums="0134761c55aa90de5cf5e6ed29bd6d4d2e3705886e44e806ffae50399fd959dee1a1d7d6acc7d1051b5df2d728e7de205b0700b52b7533f410873ff66aeed23d  deviceinfo
+sha512sums="6d77511758b1e57201139e727996d61bfd3ea2a5ea2b0ba5ca87a1591a5204a3239f070e91c1853da7071f6c66e0f360367130b1576d0b2ded5502ad1c657c60  deviceinfo
 d1c9feee9ca5f667a7f4e99654b9535ec41bde4684c3c7c5eeef530c95958af8b198d4f7c0adbf1a58e8072ad95beeb6c644d2aed5047c5b0c3f5fc7287bfe7b  90-android.rules"
diff --git a/device-sony-amami/deviceinfo b/device-sony-amami/deviceinfo
index 941e65d71..a3ab10a56 100644
--- a/device-sony-amami/deviceinfo
+++ b/device-sony-amami/deviceinfo
@@ -20,3 +20,5 @@ deviceinfo_flash_offset_ramdisk="02000000"
 deviceinfo_flash_offset_second="00f00000"
 deviceinfo_flash_offset_tags="01e00000"
 deviceinfo_flash_pagesize="2048"
+
+deviceinfo_weston_core_modules="xwayland.so"