diff --git a/aports/device/device-amazon-thor/APKBUILD b/aports/device/device-amazon-thor/APKBUILD
index 728da40d..a9f79245 100755
--- a/aports/device/device-amazon-thor/APKBUILD
+++ b/aports/device/device-amazon-thor/APKBUILD
@@ -1,11 +1,11 @@
 pkgname=device-amazon-thor
 pkgver=1
-pkgrel=3
+pkgrel=4
 pkgdesc="Amazon KFHDX 7inch 2013"
 url="https://github.com/postmarketOS"
 arch="noarch"
 license="MIT"
-depends="linux-amazon-thor mkbootimg msm-fb-refresher"
+depends="linux-amazon-thor mkbootimg msm-fb-refresher mesa-dri-swrast"
 makedepends=""
 install="$pkgname.post-install"
 subpackages=""
diff --git a/aports/device/device-asus-grouper/APKBUILD b/aports/device/device-asus-grouper/APKBUILD
index 79360713..91254256 100644
--- a/aports/device/device-asus-grouper/APKBUILD
+++ b/aports/device/device-asus-grouper/APKBUILD
@@ -1,11 +1,11 @@
 pkgname=device-asus-grouper
 pkgver=1
-pkgrel=9
+pkgrel=10
 pkgdesc="Asus Nexus 7 2012 Wifi"
 url="https://github.com/postmarketOS"
 arch="noarch"
 license="MIT"
-depends="linux-asus-grouper mkbootimg"
+depends="linux-asus-grouper mkbootimg mesa-dri-swrast"
 makedepends=""
 install=""
 subpackages=""
diff --git a/aports/device/device-fairphone-fp2/APKBUILD b/aports/device/device-fairphone-fp2/APKBUILD
index 5e1df37c..f41a7a56 100644
--- a/aports/device/device-fairphone-fp2/APKBUILD
+++ b/aports/device/device-fairphone-fp2/APKBUILD
@@ -1,11 +1,11 @@
 pkgname=device-fairphone-fp2
 pkgver=1
-pkgrel=5
+pkgrel=6
 pkgdesc="Fairphone 2"
 url="https://github.com/postmarketOS"
 arch="noarch"
 license="MIT"
-depends="linux-fairphone-fp2 linux-firmware mkbootimg"
+depends="linux-fairphone-fp2 linux-firmware mkbootimg mesa-dri-swrast"
 makedepends=""
 install=""
 subpackages=""
diff --git a/aports/device/device-google-glass/APKBUILD b/aports/device/device-google-glass/APKBUILD
index 8a6757ff..d2e32540 100644
--- a/aports/device/device-google-glass/APKBUILD
+++ b/aports/device/device-google-glass/APKBUILD
@@ -1,12 +1,12 @@
 pkgname="device-google-glass"
 pkgdesc="Google Glass"
 pkgver=0.1
-pkgrel=1
+pkgrel=2
 url="https://postmarketos.org"
 license="MIT"
 arch="noarch"
 options="!check"
-depends="linux-google-glass mkbootimg"
+depends="linux-google-glass mkbootimg mesa-dri-swrast"
 source="deviceinfo"
 
 package() {
diff --git a/aports/device/device-htc-ace/APKBUILD b/aports/device/device-htc-ace/APKBUILD
index c0a0d51c..f1ae1065 100644
--- a/aports/device/device-htc-ace/APKBUILD
+++ b/aports/device/device-htc-ace/APKBUILD
@@ -1,11 +1,11 @@
 pkgname=device-htc-ace
 pkgver=1
-pkgrel=6
+pkgrel=7
 pkgdesc="HTC Desire HD"
 url="https://github.com/postmarketOS"
 arch="noarch"
 license="MIT"
-depends="linux-htc-ace mkbootimg linux-firmware"
+depends="linux-htc-ace mkbootimg linux-firmware mesa-dri-swrast"
 makedepends=""
 install=""
 subpackages=""
diff --git a/aports/device/device-htc-bravo/APKBUILD b/aports/device/device-htc-bravo/APKBUILD
index 5fc5cbd6..30ddb85b 100644
--- a/aports/device/device-htc-bravo/APKBUILD
+++ b/aports/device/device-htc-bravo/APKBUILD
@@ -1,11 +1,11 @@
 pkgname=device-htc-bravo
 pkgver=1
-pkgrel=9
+pkgrel=10
 pkgdesc="HTC Desire"
 url="https://github.com/postmarketOS"
 arch="noarch"
 license="MIT"
-depends="linux-htc-bravo mkbootimg"
+depends="linux-htc-bravo mkbootimg mesa-dri-swrast"
 makedepends=""
 install=""
 subpackages=""
diff --git a/aports/device/device-huawei-angler/APKBUILD b/aports/device/device-huawei-angler/APKBUILD
index 24145256..12f5c573 100644
--- a/aports/device/device-huawei-angler/APKBUILD
+++ b/aports/device/device-huawei-angler/APKBUILD
@@ -1,11 +1,11 @@
 pkgname=device-huawei-angler
 pkgver=1
-pkgrel=7
+pkgrel=8
 pkgdesc="Huawei Nexus 6P"
 url="https://github.com/postmarketOS"
 arch="noarch"
 license="MIT"
-depends="linux-huawei-angler mkbootimg firmware-aosp-broadcom-wlan msm-fb-refresher"
+depends="linux-huawei-angler mkbootimg firmware-aosp-broadcom-wlan msm-fb-refresher mesa-dri-swrast"
 makedepends=""
 install=""
 subpackages=""
diff --git a/aports/device/device-huawei-y530/APKBUILD b/aports/device/device-huawei-y530/APKBUILD
index 74e49c46..1b8cbbc3 100644
--- a/aports/device/device-huawei-y530/APKBUILD
+++ b/aports/device/device-huawei-y530/APKBUILD
@@ -1,11 +1,11 @@
 pkgname=device-huawei-y530
 pkgver=1
-pkgrel=6
+pkgrel=7
 pkgdesc="Huawei Ascend Y530"
 url="https://github.com/postmarketOS"
 arch="noarch"
 license="MIT"
-depends="linux-huawei-y530 mkbootimg firmware-huawei-y530"
+depends="linux-huawei-y530 mkbootimg firmware-huawei-y530 mesa-dri-swrast"
 makedepends=""
 install=""
 subpackages=""
diff --git a/aports/device/device-leeco-s2/APKBUILD b/aports/device/device-leeco-s2/APKBUILD
index 34f304f9..d853afd9 100644
--- a/aports/device/device-leeco-s2/APKBUILD
+++ b/aports/device/device-leeco-s2/APKBUILD
@@ -2,12 +2,12 @@
 pkgname="device-leeco-s2"
 pkgdesc="LeEco Le 2"
 pkgver=0.1
-pkgrel=0
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="noarch"
 options="!check"
-depends="linux-leeco-s2 mkbootimg msm-fb-refresher"
+depends="linux-leeco-s2 mkbootimg msm-fb-refresher mesa-dri-swrast"
 makedepends="devicepkg-dev"
 source="deviceinfo"
 
diff --git a/aports/device/device-lenovo-karate/APKBUILD b/aports/device/device-lenovo-karate/APKBUILD
index 3b56e608..6c564667 100644
--- a/aports/device/device-lenovo-karate/APKBUILD
+++ b/aports/device/device-lenovo-karate/APKBUILD
@@ -1,12 +1,12 @@
 pkgname="device-lenovo-karate"
 pkgdesc="Lenovo K6 Power"
 pkgver=0.1
-pkgrel=1
+pkgrel=2
 url="https://postmarketos.org"
 license="MIT"
 arch="noarch"
 options="!check"
-depends="linux-lenovo-karate firmware-lenovo-karate mkbootimg mdss-fb-init-hack"
+depends="linux-lenovo-karate firmware-lenovo-karate mkbootimg mdss-fb-init-hack mesa-dri-swrast"
 source="deviceinfo 90-android-touch-dev.rules"
 install="$pkgname.post-install"
 
diff --git a/aports/device/device-lg-d285/APKBUILD b/aports/device/device-lg-d285/APKBUILD
index bf5da1dd..01a0b55d 100644
--- a/aports/device/device-lg-d285/APKBUILD
+++ b/aports/device/device-lg-d285/APKBUILD
@@ -1,11 +1,11 @@
 pkgname=device-lg-d285
 pkgver=1
-pkgrel=2
+pkgrel=3
 pkgdesc="LG L65"
 url="https://github.com/postmarketOS"
 arch="noarch"
 license="MIT"
-depends="linux-lg-d285 mkbootimg msm-fb-refresher"
+depends="linux-lg-d285 mkbootimg msm-fb-refresher mesa-dri-swrast"
 makedepends=""
 install=""
 subpackages=""
diff --git a/aports/device/device-lg-d855/APKBUILD b/aports/device/device-lg-d855/APKBUILD
index cd78ecfb..ab59d79d 100644
--- a/aports/device/device-lg-d855/APKBUILD
+++ b/aports/device/device-lg-d855/APKBUILD
@@ -1,11 +1,11 @@
 pkgname=device-lg-d855
 pkgver=1
-pkgrel=11
+pkgrel=12
 pkgdesc="LG G3 International"
 url="https://github.com/postmarketOS"
 arch="noarch"
 license="MIT"
-depends="linux-lg-d855 mkbootimg"
+depends="linux-lg-d855 mkbootimg mesa-dri-swrast"
 makedepends=""
 install=""
 subpackages=""
diff --git a/aports/device/device-lg-dory/APKBUILD b/aports/device/device-lg-dory/APKBUILD
index 1eed7382..56bbf08e 100644
--- a/aports/device/device-lg-dory/APKBUILD
+++ b/aports/device/device-lg-dory/APKBUILD
@@ -1,11 +1,11 @@
 pkgname=device-lg-dory
 pkgver=1
-pkgrel=3
+pkgrel=4
 pkgdesc="LG G Watch"
 url="https://github.com/postmarketOS"
 arch="noarch"
 license="MIT"
-depends="linux-lg-dory mkbootimg msm-fb-refresher"
+depends="linux-lg-dory mkbootimg msm-fb-refresher mesa-dri-swrast"
 makedepends=""
 install=""
 subpackages=""
diff --git a/aports/device/device-lg-h815/APKBUILD b/aports/device/device-lg-h815/APKBUILD
index 7bafa3c8..bc12d2e8 100644
--- a/aports/device/device-lg-h815/APKBUILD
+++ b/aports/device/device-lg-h815/APKBUILD
@@ -2,12 +2,12 @@
 pkgname="device-lg-h815"
 pkgdesc="LG G4 (h815)"
 pkgver=0.1
-pkgrel=0
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="noarch"
 options="!check"
-depends="linux-lg-h815 mkbootimg msm-fb-refresher"
+depends="linux-lg-h815 mkbootimg msm-fb-refresher mesa-dri-swrast"
 makedepends="devicepkg-dev"
 source="deviceinfo"
 
diff --git a/aports/device/device-lg-hammerhead/APKBUILD b/aports/device/device-lg-hammerhead/APKBUILD
index 9c878979..7ed94be9 100644
--- a/aports/device/device-lg-hammerhead/APKBUILD
+++ b/aports/device/device-lg-hammerhead/APKBUILD
@@ -1,11 +1,11 @@
 pkgname=device-lg-hammerhead
 pkgver=1
-pkgrel=16
+pkgrel=17
 pkgdesc="Google Nexus 5"
 url="https://github.com/postmarketOS"
 arch="noarch"
 license="MIT"
-depends="linux-lg-hammerhead linux-firmware mkbootimg msm-fb-refresher"
+depends="linux-lg-hammerhead linux-firmware mkbootimg msm-fb-refresher mesa-dri-swrast"
 makedepends=""
 install=""
 subpackages="$pkgname-weston $pkgname-x11"
diff --git a/aports/device/device-lg-lenok/APKBUILD b/aports/device/device-lg-lenok/APKBUILD
index 21417c0c..96e31087 100644
--- a/aports/device/device-lg-lenok/APKBUILD
+++ b/aports/device/device-lg-lenok/APKBUILD
@@ -1,11 +1,11 @@
 pkgname=device-lg-lenok
 pkgver=1
-pkgrel=6
+pkgrel=7
 pkgdesc="LG G Watch R"
 url="https://github.com/postmarketOS"
 arch="noarch"
 license="MIT"
-depends="linux-lg-lenok mkbootimg"
+depends="linux-lg-lenok mkbootimg mesa-dri-swrast"
 makedepends=""
 install=""
 subpackages=""
diff --git a/aports/device/device-lg-mako/APKBUILD b/aports/device/device-lg-mako/APKBUILD
index 326c3121..def6de72 100644
--- a/aports/device/device-lg-mako/APKBUILD
+++ b/aports/device/device-lg-mako/APKBUILD
@@ -1,11 +1,11 @@
 pkgname=device-lg-mako
 pkgver=2
-pkgrel=15
+pkgrel=16
 pkgdesc="Google Nexus 4"
 url="https://github.com/postmarketOS"
 arch="noarch"
 license="MIT"
-depends="linux-lg-mako mkbootimg"
+depends="linux-lg-mako mkbootimg mesa-dri-swrast"
 makedepends=""
 install=""
 subpackages="$pkgname-weston"
diff --git a/aports/device/device-motorola-osprey/APKBUILD b/aports/device/device-motorola-osprey/APKBUILD
index 3243c0f4..9c32b4f7 100644
--- a/aports/device/device-motorola-osprey/APKBUILD
+++ b/aports/device/device-motorola-osprey/APKBUILD
@@ -1,11 +1,11 @@
 pkgname=device-motorola-osprey
 pkgver=1
-pkgrel=3
+pkgrel=4
 pkgdesc="Motorola Moto G 3rd gen. (2015)"
 url="https://github.com/postmarketOS"
 arch="noarch"
 license="MIT"
-depends="linux-motorola-osprey mkbootimg"
+depends="linux-motorola-osprey mkbootimg mesa-dri-swrast"
 makedepends=""
 install=""
 subpackages=""
diff --git a/aports/device/device-motorola-titan/APKBUILD b/aports/device/device-motorola-titan/APKBUILD
index 0cbdd3d8..5693d4e4 100644
--- a/aports/device/device-motorola-titan/APKBUILD
+++ b/aports/device/device-motorola-titan/APKBUILD
@@ -1,11 +1,11 @@
 pkgname=device-motorola-titan
 pkgver=1
-pkgrel=19
+pkgrel=20
 pkgdesc="Motorola Moto G 2014"
 url="https://github.com/postmarketOS"
 arch="noarch"
 license="MIT"
-depends="linux-motorola-titan firmware-motorola-titan mkbootimg msm-fb-refresher"
+depends="linux-motorola-titan firmware-motorola-titan mkbootimg msm-fb-refresher mesa-dri-swrast"
 makedepends=""
 install="$pkgname.post-install"
 subpackages="$pkgname-weston"
diff --git a/aports/device/device-nokia-rx51/APKBUILD b/aports/device/device-nokia-rx51/APKBUILD
index eb8f2a5e..0ed1831d 100644
--- a/aports/device/device-nokia-rx51/APKBUILD
+++ b/aports/device/device-nokia-rx51/APKBUILD
@@ -1,11 +1,11 @@
 pkgname=device-nokia-rx51
 pkgver=1
-pkgrel=27
+pkgrel=28
 pkgdesc="Nokia N900"
 url="https://github.com/postmarketOS"
 arch="noarch"
 license="MIT"
-depends="linux-postmarketos-stable uboot-tools linux-firmware kbd kbd-bkeymaps ofono"
+depends="linux-postmarketos-stable uboot-tools linux-firmware kbd kbd-bkeymaps ofono mesa-dri-swrast"
 makedepends="uboot-tools kbd kbd-bkeymaps"
 install="$pkgname.post-install"
 subpackages="$pkgname-weston:weston"
diff --git a/aports/device/device-oneplus-bacon/APKBUILD b/aports/device/device-oneplus-bacon/APKBUILD
index 1767a38c..735b1f78 100644
--- a/aports/device/device-oneplus-bacon/APKBUILD
+++ b/aports/device/device-oneplus-bacon/APKBUILD
@@ -1,11 +1,11 @@
 pkgname=device-oneplus-bacon
 pkgver=1
-pkgrel=7
+pkgrel=8
 pkgdesc="OnePlus One"
 url="https://github.com/postmarketOS"
 arch="noarch"
 license="MIT"
-depends="linux-oneplus-bacon linux-firmware mkbootimg"
+depends="linux-oneplus-bacon linux-firmware mkbootimg mesa-dri-swrast"
 makedepends=""
 install=""
 subpackages="$pkgname-weston"
diff --git a/aports/device/device-oneplus-onyx/APKBUILD b/aports/device/device-oneplus-onyx/APKBUILD
index f4a8d71e..6bc566cb 100644
--- a/aports/device/device-oneplus-onyx/APKBUILD
+++ b/aports/device/device-oneplus-onyx/APKBUILD
@@ -1,11 +1,11 @@
 pkgname=device-oneplus-onyx
 pkgver=1
-pkgrel=1
+pkgrel=2
 pkgdesc="OnePlus X"
 url="https://github.com/postmarketOS"
 arch="noarch"
 license="MIT"
-depends="linux-oneplus-onyx linux-firmware mkbootimg msm-fb-refresher"
+depends="linux-oneplus-onyx linux-firmware mkbootimg msm-fb-refresher mesa-dri-swrast"
 makedepends=""
 install=""
 source="deviceinfo 90-android-touch-dev.rules fb.modes"
diff --git a/aports/device/device-qemu-aarch64/APKBUILD b/aports/device/device-qemu-aarch64/APKBUILD
index 90885c9c..9811d2c6 100644
--- a/aports/device/device-qemu-aarch64/APKBUILD
+++ b/aports/device/device-qemu-aarch64/APKBUILD
@@ -1,11 +1,11 @@
 pkgname=device-qemu-aarch64
 pkgver=1
-pkgrel=7
+pkgrel=8
 pkgdesc="Simulated device in qemu with vexpress soc"
 url="https://github.com/postmarketOS"
 arch="noarch"
 license="MIT"
-depends="linux-postmarketos-stable"
+depends="linux-postmarketos-stable mesa-dri-swrast"
 makedepends=""
 subpackages=""
 source="deviceinfo interfaces"
diff --git a/aports/device/device-qemu-amd64/APKBUILD b/aports/device/device-qemu-amd64/APKBUILD
index 8ea0710a..4d72ccb8 100644
--- a/aports/device/device-qemu-amd64/APKBUILD
+++ b/aports/device/device-qemu-amd64/APKBUILD
@@ -5,6 +5,7 @@ pkgdesc="Simulated device in qemu with an x86 platform"
 url="https://github.com/postmarketOS"
 arch="noarch"
 license="MIT"
+# NOTE: 'pmbootstrap init' allows you to choose the mesa-dri-* package
 depends="linux-postmarketos-lts"
 makedepends=""
 subpackages="$pkgname-x11 $pkgname-weston"
diff --git a/aports/device/device-qemu-vexpress/APKBUILD b/aports/device/device-qemu-vexpress/APKBUILD
index ad2491be..96658e84 100644
--- a/aports/device/device-qemu-vexpress/APKBUILD
+++ b/aports/device/device-qemu-vexpress/APKBUILD
@@ -1,11 +1,11 @@
 pkgname=device-qemu-vexpress
 pkgver=1
-pkgrel=14
+pkgrel=15
 pkgdesc="Simulated device in qemu with vexpress soc"
 url="https://github.com/postmarketOS"
 arch="noarch"
 license="MIT"
-depends="linux-postmarketos-stable"
+depends="linux-postmarketos-stable mesa-dri-swrast"
 makedepends=""
 subpackages=""
 source="deviceinfo interfaces"
diff --git a/aports/device/device-samsung-espresso10/APKBUILD b/aports/device/device-samsung-espresso10/APKBUILD
index 612c51a8..24e88c5e 100644
--- a/aports/device/device-samsung-espresso10/APKBUILD
+++ b/aports/device/device-samsung-espresso10/APKBUILD
@@ -2,12 +2,12 @@
 pkgname="device-samsung-espresso10"
 pkgdesc="Samsung Galaxy Tab 2 (10.1 inch)"
 pkgver=0.1
-pkgrel=1
+pkgrel=2
 url="https://postmarketos.org"
 license="MIT"
 arch="noarch"
 options="!check"
-depends="linux-samsung-espresso10 firmware-samsung-espresso10 mkbootimg"
+depends="linux-samsung-espresso10 firmware-samsung-espresso10 mkbootimg mesa-dri-swrast"
 makedepends="devicepkg-dev"
 source="deviceinfo"
 
diff --git a/aports/device/device-samsung-i747m/APKBUILD b/aports/device/device-samsung-i747m/APKBUILD
index 904fe0e7..88c4c9be 100644
--- a/aports/device/device-samsung-i747m/APKBUILD
+++ b/aports/device/device-samsung-i747m/APKBUILD
@@ -1,12 +1,12 @@
 pkgname="device-samsung-i747m"
 pkgdesc="Samsing Galaxy SIII (USA/Canada)"
 pkgver=0.1
-pkgrel=1
+pkgrel=2
 url="https://postmarketos.org"
 license="MIT"
 arch="noarch"
 options="!check"
-depends="linux-samsung-i747m firmware-samsung-i747m mkbootimg"
+depends="linux-samsung-i747m firmware-samsung-i747m mkbootimg mesa-dri-swrast"
 source="deviceinfo 90-android-touch-dev.rules fb.modes"
 
 package() {
diff --git a/aports/device/device-samsung-i9003/APKBUILD b/aports/device/device-samsung-i9003/APKBUILD
index 601f903c..ae0c68cc 100644
--- a/aports/device/device-samsung-i9003/APKBUILD
+++ b/aports/device/device-samsung-i9003/APKBUILD
@@ -1,11 +1,11 @@
 pkgname=device-samsung-i9003
 pkgver=1
-pkgrel=15
+pkgrel=16
 pkgdesc="Samsung Galaxy SI SLC"
 url="https://github.com/postmarketOS"
 arch="noarch"
 license="MIT"
-depends="linux-samsung-i9003 libsamsung-ipc mkbootimg"
+depends="linux-samsung-i9003 libsamsung-ipc mkbootimg mesa-dri-swrast"
 makedepends=""
 install=""
 subpackages=""
diff --git a/aports/device/device-samsung-i9070/APKBUILD b/aports/device/device-samsung-i9070/APKBUILD
index cbb52d2e..acfa3b0a 100644
--- a/aports/device/device-samsung-i9070/APKBUILD
+++ b/aports/device/device-samsung-i9070/APKBUILD
@@ -1,12 +1,12 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-samsung-i9070
 pkgver=1
-pkgrel=17
+pkgrel=18
 pkgdesc="Samsung Galaxy S Advance"
 url="https://github.com/postmarketOS"
 arch="noarch"
 license="MIT"
-depends="linux-samsung-i9070 firmware-samsung-i9070"
+depends="linux-samsung-i9070 firmware-samsung-i9070 mesa-dri-swrast"
 makedepends="devicepkg-dev"
 install=""
 subpackages="$pkgname-mesa"
@@ -30,12 +30,6 @@ package() {
 		"$pkgdir"/etc/modules-load.d/00-${pkgname}.conf
 }
 
-mesa() {
-	install_if="$pkgname mesa"
-	depends="mesa-dri-swrast"
-	mkdir "$subpkgdir"
-}
-
 sha512sums="fe7b2af2abd441775705e5d228eab7904194bb3ef6af08a69593849e3380e6c9fc4905b3eac52e851aff0f2364a4425a79da8e6e48416b7a630754a525df3b9e  deviceinfo
 098187f6ab56d2542f98f1b5fbcf493431f665a4300db05e859357366e39b02a3d508bfd94c1d1bd7c669261e7ef0d4e1aef1fdbb15541fe34f3f48a6caa247f  initfs-hook.sh
 61e8becbf6fa7c1c6c42e481083f5981ae7af33a48cbc53e817d8ac2c6a8e4f67a54b32ae3b8f5f25f7b412165a849dc93a629110dc47b0d16927bf2a12eb7e1  modules-load.conf"
diff --git a/aports/device/device-samsung-i9100/APKBUILD b/aports/device/device-samsung-i9100/APKBUILD
index 6a4740ee..fbfe0024 100644
--- a/aports/device/device-samsung-i9100/APKBUILD
+++ b/aports/device/device-samsung-i9100/APKBUILD
@@ -1,11 +1,11 @@
 pkgname=device-samsung-i9100
 pkgver=1
-pkgrel=16
+pkgrel=17
 pkgdesc="Samsung Galaxy SII"
 url="https://github.com/postmarketOS"
 arch="noarch"
 license="MIT"
-depends="linux-samsung-i9100 firmware-samsung-i9100 libsamsung-ipc"
+depends="linux-samsung-i9100 firmware-samsung-i9100 libsamsung-ipc mesa-dri-swrast"
 makedepends=""
 install="$pkgname.post-install"
 subpackages=""
diff --git a/aports/device/device-samsung-i9305/APKBUILD b/aports/device/device-samsung-i9305/APKBUILD
index e59600fd..dd042820 100644
--- a/aports/device/device-samsung-i9305/APKBUILD
+++ b/aports/device/device-samsung-i9305/APKBUILD
@@ -1,11 +1,11 @@
 pkgname=device-samsung-i9305
 pkgver=1
-pkgrel=15
+pkgrel=16
 pkgdesc="Samsung Galaxy SIII LTE"
 url="https://github.com/postmarketOS"
 arch="noarch"
 license="MIT"
-depends="linux-samsung-i9305 firmware-samsung-i9305 mkbootimg"
+depends="linux-samsung-i9305 firmware-samsung-i9305 mkbootimg mesa-dri-swrast"
 makedepends=""
 install="$pkgname.post-install"
 subpackages=""
diff --git a/aports/device/device-samsung-i9505/APKBUILD b/aports/device/device-samsung-i9505/APKBUILD
index f8ab65c3..40306ca1 100644
--- a/aports/device/device-samsung-i9505/APKBUILD
+++ b/aports/device/device-samsung-i9505/APKBUILD
@@ -1,12 +1,12 @@
 pkgname="device-samsung-i9505"
 pkgdesc="Samsung Galaxy S4 International"
 pkgver=0.4
-pkgrel=1
+pkgrel=2
 url="https://postmarketos.org"
 license="MIT"
 arch="noarch"
 options="!check"
-depends="linux-samsung-i9505 firmware-samsung-i9505 mkbootimg"
+depends="linux-samsung-i9505 firmware-samsung-i9505 mkbootimg mesa-dri-swrast"
 source="deviceinfo 90-android-sec_touchscreen.rules"
 
 package() {
diff --git a/aports/device/device-samsung-maguro/APKBUILD b/aports/device/device-samsung-maguro/APKBUILD
index 7e13f94b..0f17e2f3 100644
--- a/aports/device/device-samsung-maguro/APKBUILD
+++ b/aports/device/device-samsung-maguro/APKBUILD
@@ -1,12 +1,12 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-samsung-maguro
 pkgver=2
-pkgrel=15
+pkgrel=16
 pkgdesc="Google Galaxy Nexus (GSM)"
 url="https://github.com/postmarketOS"
 arch="noarch"
 license="MIT"
-depends="linux-samsung-maguro mkbootimg firmware-samsung-maguro"
+depends="linux-samsung-maguro mkbootimg firmware-samsung-maguro mesa-dri-swrast"
 makedepends="devicepkg-dev"
 install=""
 subpackages="$pkgname-mesa"
@@ -21,10 +21,4 @@ package() {
 	devicepkg_package $startdir $pkgname
 }
 
-mesa() {
-	install_if="$pkgname mesa"
-	depends="mesa-dri-swrast"
-	mkdir "$subpkgdir"
-}
-
 sha512sums="e44e78b362c7414eab0031b559732a18f3adf09cc02b3b9a6c05e1553cfebf91abf9f5364bdbb154d3883bdb71e1b3382b398fa38e1a15385ed2749568329c84  deviceinfo"
diff --git a/aports/device/device-samsung-n7100/APKBUILD b/aports/device/device-samsung-n7100/APKBUILD
index 8aaaddda..e530aa7d 100644
--- a/aports/device/device-samsung-n7100/APKBUILD
+++ b/aports/device/device-samsung-n7100/APKBUILD
@@ -1,11 +1,11 @@
 pkgname=device-samsung-n7100
 pkgver=1
-pkgrel=12
+pkgrel=13
 pkgdesc="Samsung Galaxy Note II (GSM)"
 url="https://github.com/postmarketOS"
 arch="noarch"
 license="MIT"
-depends="linux-samsung-n7100 mkbootimg"
+depends="linux-samsung-n7100 mkbootimg mesa-dri-swrast"
 makedepends=""
 install=""
 subpackages=""
diff --git a/aports/device/device-samsung-s6500d/APKBUILD b/aports/device/device-samsung-s6500d/APKBUILD
index 8263053f..2b161214 100644
--- a/aports/device/device-samsung-s6500d/APKBUILD
+++ b/aports/device/device-samsung-s6500d/APKBUILD
@@ -2,12 +2,12 @@
 pkgname="device-samsung-s6500d"
 pkgdesc="Samsung Galaxy Mini 2"
 pkgver=0.1
-pkgrel=0
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="noarch"
 options="!check"
-depends="linux-samsung-s6500d mkbootimg"
+depends="linux-samsung-s6500d mkbootimg mesa-dri-swrast"
 makedepends="devicepkg-dev"
 source="deviceinfo"
 
diff --git a/aports/device/device-sony-amami/APKBUILD b/aports/device/device-sony-amami/APKBUILD
index a3512ceb..822a940e 100644
--- a/aports/device/device-sony-amami/APKBUILD
+++ b/aports/device/device-sony-amami/APKBUILD
@@ -1,11 +1,11 @@
 pkgname=device-sony-amami
 pkgver=1
-pkgrel=15
+pkgrel=16
 pkgdesc="Sony Xperia Z1 Compact"
 url="https://github.com/postmarketOS"
 arch="noarch"
 license="MIT"
-depends="linux-sony-amami mkbootimg mdss-fb-init-hack firmware-sony-amami"
+depends="linux-sony-amami mkbootimg mdss-fb-init-hack firmware-sony-amami mesa-dri-swrast"
 makedepends=""
 install=""
 subpackages=""
diff --git a/aports/device/device-sony-aries/APKBUILD b/aports/device/device-sony-aries/APKBUILD
index 0384ab3f..9198cd2c 100644
--- a/aports/device/device-sony-aries/APKBUILD
+++ b/aports/device/device-sony-aries/APKBUILD
@@ -1,11 +1,11 @@
 pkgname=device-sony-aries
 pkgver=1
-pkgrel=13
+pkgrel=14
 pkgdesc="Sony Xperia Z3 Compact"
 url="https://github.com/postmarketOS"
 arch="noarch"
 license="MIT"
-depends="linux-sony-aries mkbootimg"
+depends="linux-sony-aries mkbootimg mesa-dri-swrast"
 makedepends=""
 install=""
 subpackages=""
diff --git a/aports/device/device-sony-honami/APKBUILD b/aports/device/device-sony-honami/APKBUILD
index efe6089c..4455fe76 100644
--- a/aports/device/device-sony-honami/APKBUILD
+++ b/aports/device/device-sony-honami/APKBUILD
@@ -1,12 +1,12 @@
 pkgname="device-sony-honami"
 pkgdesc="Sony Xperia Z1"
 pkgver=1.0
-pkgrel=1
+pkgrel=2
 url="https://postmarketos.org"
 license="MIT"
 arch="noarch"
 options="!check"
-depends="linux-sony-honami firmware-sony-amami msm-fb-refresher mkbootimg"
+depends="linux-sony-honami firmware-sony-amami msm-fb-refresher mkbootimg mesa-dri-swrast"
 source="deviceinfo 90-android-touch-dev.rules"
 
 package() {
diff --git a/aports/device/device-sony-yuga/APKBUILD b/aports/device/device-sony-yuga/APKBUILD
index 3581e9dd..bf3e4155 100644
--- a/aports/device/device-sony-yuga/APKBUILD
+++ b/aports/device/device-sony-yuga/APKBUILD
@@ -1,11 +1,11 @@
 pkgname=device-sony-yuga
 pkgver=1
-pkgrel=7
+pkgrel=8
 pkgdesc="Sony Xperia Z"
 url="https://github.com/postmarketOS"
 arch="noarch"
 license="MIT"
-depends="linux-sony-yuga mkbootimg"
+depends="linux-sony-yuga mkbootimg mesa-dri-swrast"
 makedepends=""
 install=""
 subpackages=""
diff --git a/aports/device/device-t2m-flame/APKBUILD b/aports/device/device-t2m-flame/APKBUILD
index be0d3414..4e48eb54 100644
--- a/aports/device/device-t2m-flame/APKBUILD
+++ b/aports/device/device-t2m-flame/APKBUILD
@@ -1,11 +1,11 @@
 pkgname=device-t2m-flame
 pkgver=1
-pkgrel=7
+pkgrel=8
 pkgdesc="Mozilla Flame"
 url="https://github.com/postmarketOS"
 arch="noarch"
 license="MIT"
-depends="linux-t2m-flame firmware-t2m-flame mkbootimg"
+depends="linux-t2m-flame firmware-t2m-flame mkbootimg mesa-dri-swrast"
 makedepends=""
 install="$pkgname.post-install"
 subpackages="$pkgname-weston"
diff --git a/aports/device/device-wiko-lenny3/APKBUILD b/aports/device/device-wiko-lenny3/APKBUILD
index 7597fa1c..e608dd0f 100644
--- a/aports/device/device-wiko-lenny3/APKBUILD
+++ b/aports/device/device-wiko-lenny3/APKBUILD
@@ -1,12 +1,12 @@
 pkgname="device-wiko-lenny3"
 pkgdesc="Lenny 3"
 pkgver=0.1
-pkgrel=1
+pkgrel=2
 url="https://postmarketos.org"
 license="MIT"
 arch="noarch"
 options="!check"
-depends="linux-wiko-lenny3 mkbootimg"
+depends="linux-wiko-lenny3 mkbootimg mesa-dri-swrast"
 source="deviceinfo"
 
 package() {
diff --git a/aports/device/device-xiaomi-ido/APKBUILD b/aports/device/device-xiaomi-ido/APKBUILD
index 93caa299..5700c3d2 100644
--- a/aports/device/device-xiaomi-ido/APKBUILD
+++ b/aports/device/device-xiaomi-ido/APKBUILD
@@ -2,12 +2,12 @@
 pkgname="device-xiaomi-ido"
 pkgdesc="Xiaomi Xiaomi RedMi 3"
 pkgver=0.1
-pkgrel=0
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="noarch"
 options="!check"
-depends="linux-xiaomi-ido mkbootimg"
+depends="linux-xiaomi-ido mkbootimg mesa-dri-swrast"
 makedepends="devicepkg-dev"
 source="deviceinfo
 	fb.modes
diff --git a/pmb/aportgen/device.py b/pmb/aportgen/device.py
index 7b1e4f48..c6756113 100644
--- a/pmb/aportgen/device.py
+++ b/pmb/aportgen/device.py
@@ -180,11 +180,15 @@ def generate_deviceinfo(args, pkgname, name, manufacturer, arch, has_keyboard,
 
 
 def generate_apkbuild(args, pkgname, name, arch, flash_method):
+    # Dependencies
     depends = "linux-" + "-".join(pkgname.split("-")[1:])
     if flash_method in ["fastboot", "heimdall-bootimg"]:
         depends += " mkbootimg"
     if flash_method == "0xffff":
         depends += " uboot-tools"
+    depends += " mesa-dri-swrast"
+
+    # Whole APKBUILD
     content = """\
         # Reference: <https://postmarketos.org/devicepkg>
         pkgname=\"""" + pkgname + """\"
diff --git a/test/test_aportgen_device_wizard.py b/test/test_aportgen_device_wizard.py
index 9554f616..9889947b 100644
--- a/test/test_aportgen_device_wizard.py
+++ b/test/test_aportgen_device_wizard.py
@@ -113,7 +113,7 @@ def test_aportgen_device_wizard(args, monkeypatch):
     deviceinfo, apkbuild, apkbuild_linux = generate(args, monkeypatch, answers)
     assert apkbuild["pkgname"] == "device-testsuite-testdevice"
     assert apkbuild["pkgdesc"] == "Testsuite Testdevice"
-    assert apkbuild["depends"] == ["linux-testsuite-testdevice"]
+    assert apkbuild["depends"] == ["linux-testsuite-testdevice", "mesa-dri-swrast"]
 
     assert apkbuild_linux["pkgname"] == "linux-testsuite-testdevice"
     assert apkbuild_linux["pkgdesc"] == "Testsuite Testdevice kernel fork"
@@ -146,12 +146,12 @@ def test_aportgen_device_wizard(args, monkeypatch):
     answers["Flash method"] = "fastboot"
     answers["Path"] = ""
     deviceinfo, apkbuild, apkbuild_linux = generate(args, monkeypatch, answers)
-    assert apkbuild["depends"] == ["linux-testsuite-testdevice", "mkbootimg"]
+    assert apkbuild["depends"] == ["linux-testsuite-testdevice", "mkbootimg", "mesa-dri-swrast"]
     assert deviceinfo["flash_method"] == answers["Flash method"]
     assert deviceinfo["generate_bootimg"] == "true"
 
     # 0xffff (legacy uboot initfs)
     answers["Flash method"] = "0xffff"
     deviceinfo, apkbuild, apkbuild_linux = generate(args, monkeypatch, answers)
-    assert apkbuild["depends"] == ["linux-testsuite-testdevice", "uboot-tools"]
+    assert apkbuild["depends"] == ["linux-testsuite-testdevice", "uboot-tools", "mesa-dri-swrast"]
     assert deviceinfo["generate_legacy_uboot_initfs"] == "true"