diff --git a/device/device-amazon-thor/APKBUILD b/device/device-amazon-thor/APKBUILD
index a9f79245f..49b4e85db 100755
--- a/device/device-amazon-thor/APKBUILD
+++ b/device/device-amazon-thor/APKBUILD
@@ -1,11 +1,11 @@
 pkgname=device-amazon-thor
 pkgver=1
-pkgrel=4
+pkgrel=5
 pkgdesc="Amazon KFHDX 7inch 2013"
 url="https://github.com/postmarketOS"
 arch="noarch"
 license="MIT"
-depends="linux-amazon-thor mkbootimg msm-fb-refresher mesa-dri-swrast"
+depends="postmarketos-base linux-amazon-thor mkbootimg msm-fb-refresher mesa-dri-swrast"
 makedepends=""
 install="$pkgname.post-install"
 subpackages=""
diff --git a/device/device-asus-flo/APKBUILD b/device/device-asus-flo/APKBUILD
index cb8a8270a..6ea19f221 100644
--- a/device/device-asus-flo/APKBUILD
+++ b/device/device-asus-flo/APKBUILD
@@ -1,11 +1,11 @@
 pkgname=device-asus-flo
 pkgver=0
-pkgrel=8
+pkgrel=9
 pkgdesc="Google Nexus 7 2013 flo"
 url="https://github.com/postmarketOS"
 arch="noarch"
 license="MIT"
-depends="linux-asus-flo mkbootimg firmware-asus-flo mesa mesa-egl mesa-dri-freedreno"
+depends="postmarketos-base linux-asus-flo mkbootimg firmware-asus-flo mesa mesa-egl mesa-dri-freedreno"
 makedepends=""
 install=""
 subpackages="$pkgname-weston"
diff --git a/device/device-asus-grouper/APKBUILD b/device/device-asus-grouper/APKBUILD
index 91254256f..77f1ce9ef 100644
--- a/device/device-asus-grouper/APKBUILD
+++ b/device/device-asus-grouper/APKBUILD
@@ -1,11 +1,11 @@
 pkgname=device-asus-grouper
 pkgver=1
-pkgrel=10
+pkgrel=11
 pkgdesc="Asus Nexus 7 2012 Wifi"
 url="https://github.com/postmarketOS"
 arch="noarch"
 license="MIT"
-depends="linux-asus-grouper mkbootimg mesa-dri-swrast"
+depends="postmarketos-base linux-asus-grouper mkbootimg mesa-dri-swrast"
 makedepends=""
 install=""
 subpackages=""
diff --git a/device/device-asus-t00f/APKBUILD b/device/device-asus-t00f/APKBUILD
index 5554edd9b..9166efb02 100644
--- a/device/device-asus-t00f/APKBUILD
+++ b/device/device-asus-t00f/APKBUILD
@@ -1,12 +1,12 @@
 pkgname="device-asus-t00f"
 pkgdesc="Asus Zenfone 5"
 pkgver=0.1
-pkgrel=0
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="noarch"
 options="!check"
-depends="linux-asus-t00f mkbootimg"
+depends="postmarketos-base linux-asus-t00f mkbootimg"
 makedepends="devicepkg-dev"
 subpackages="$pkgname-x11"
 source="
diff --git a/device/device-asus-tf101/APKBUILD b/device/device-asus-tf101/APKBUILD
index d1a230c16..d1b201012 100644
--- a/device/device-asus-tf101/APKBUILD
+++ b/device/device-asus-tf101/APKBUILD
@@ -2,12 +2,12 @@
 pkgname="device-asus-tf101"
 pkgdesc="Asus Eee Pad Transformer"
 pkgver=0.2
-pkgrel=1
+pkgrel=2
 url="https://postmarketos.org"
 license="MIT"
 arch="noarch"
 options="!check"
-depends="linux-asus-tf101 mkbootimg blobtools"
+depends="postmarketos-base linux-asus-tf101 mkbootimg blobtools"
 makedepends="devicepkg-dev"
 source="deviceinfo"
 
diff --git a/device/device-fairphone-fp2/APKBUILD b/device/device-fairphone-fp2/APKBUILD
index f41a7a56b..d85873b3c 100644
--- a/device/device-fairphone-fp2/APKBUILD
+++ b/device/device-fairphone-fp2/APKBUILD
@@ -1,11 +1,11 @@
 pkgname=device-fairphone-fp2
 pkgver=1
-pkgrel=6
+pkgrel=7
 pkgdesc="Fairphone 2"
 url="https://github.com/postmarketOS"
 arch="noarch"
 license="MIT"
-depends="linux-fairphone-fp2 linux-firmware mkbootimg mesa-dri-swrast"
+depends="postmarketos-base linux-fairphone-fp2 linux-firmware mkbootimg mesa-dri-swrast"
 makedepends=""
 install=""
 subpackages=""
diff --git a/device/device-google-glass/APKBUILD b/device/device-google-glass/APKBUILD
index d2e32540d..21e909e41 100644
--- a/device/device-google-glass/APKBUILD
+++ b/device/device-google-glass/APKBUILD
@@ -1,12 +1,12 @@
 pkgname="device-google-glass"
 pkgdesc="Google Glass"
 pkgver=0.1
-pkgrel=2
+pkgrel=3
 url="https://postmarketos.org"
 license="MIT"
 arch="noarch"
 options="!check"
-depends="linux-google-glass mkbootimg mesa-dri-swrast"
+depends="postmarketos-base linux-google-glass mkbootimg mesa-dri-swrast"
 source="deviceinfo"
 
 package() {
diff --git a/device/device-gp-peak/APKBUILD b/device/device-gp-peak/APKBUILD
index 82324fc83..31ebe2063 100644
--- a/device/device-gp-peak/APKBUILD
+++ b/device/device-gp-peak/APKBUILD
@@ -2,12 +2,12 @@
 pkgname="device-gp-peak"
 pkgdesc="Geeksphone Peak"
 pkgver=0.1
-pkgrel=2
+pkgrel=3
 url="https://postmarketos.org"
 license="MIT"
 arch="noarch"
 options="!check"
-depends="linux-gp-peak mkbootimg mesa-dri-swrast msm-fb-refresher"
+depends="postmarketos-base linux-gp-peak mkbootimg mesa-dri-swrast msm-fb-refresher"
 makedepends="devicepkg-dev"
 source="
 	deviceinfo
diff --git a/device/device-htc-ace/APKBUILD b/device/device-htc-ace/APKBUILD
index f1ae10657..ef11bd96c 100644
--- a/device/device-htc-ace/APKBUILD
+++ b/device/device-htc-ace/APKBUILD
@@ -1,11 +1,11 @@
 pkgname=device-htc-ace
 pkgver=1
-pkgrel=7
+pkgrel=8
 pkgdesc="HTC Desire HD"
 url="https://github.com/postmarketOS"
 arch="noarch"
 license="MIT"
-depends="linux-htc-ace mkbootimg linux-firmware mesa-dri-swrast"
+depends="postmarketos-base linux-htc-ace mkbootimg linux-firmware mesa-dri-swrast"
 makedepends=""
 install=""
 subpackages=""
diff --git a/device/device-htc-bravo/APKBUILD b/device/device-htc-bravo/APKBUILD
index 30ddb85ba..24b6f95fa 100644
--- a/device/device-htc-bravo/APKBUILD
+++ b/device/device-htc-bravo/APKBUILD
@@ -1,11 +1,11 @@
 pkgname=device-htc-bravo
 pkgver=1
-pkgrel=10
+pkgrel=11
 pkgdesc="HTC Desire"
 url="https://github.com/postmarketOS"
 arch="noarch"
 license="MIT"
-depends="linux-htc-bravo mkbootimg mesa-dri-swrast"
+depends="postmarketos-base linux-htc-bravo mkbootimg mesa-dri-swrast"
 makedepends=""
 install=""
 subpackages=""
diff --git a/device/device-huawei-angler/APKBUILD b/device/device-huawei-angler/APKBUILD
index 12f5c5736..2222c31a4 100644
--- a/device/device-huawei-angler/APKBUILD
+++ b/device/device-huawei-angler/APKBUILD
@@ -1,11 +1,11 @@
 pkgname=device-huawei-angler
 pkgver=1
-pkgrel=8
+pkgrel=9
 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 mesa-dri-swrast"
+depends="postmarketos-base linux-huawei-angler mkbootimg firmware-aosp-broadcom-wlan msm-fb-refresher mesa-dri-swrast"
 makedepends=""
 install=""
 subpackages=""
diff --git a/device/device-huawei-y530/APKBUILD b/device/device-huawei-y530/APKBUILD
index 1b8cbbc34..f4a58462f 100644
--- a/device/device-huawei-y530/APKBUILD
+++ b/device/device-huawei-y530/APKBUILD
@@ -1,11 +1,11 @@
 pkgname=device-huawei-y530
 pkgver=1
-pkgrel=7
+pkgrel=8
 pkgdesc="Huawei Ascend Y530"
 url="https://github.com/postmarketOS"
 arch="noarch"
 license="MIT"
-depends="linux-huawei-y530 mkbootimg firmware-huawei-y530 mesa-dri-swrast"
+depends="postmarketos-base linux-huawei-y530 mkbootimg firmware-huawei-y530 mesa-dri-swrast"
 makedepends=""
 install=""
 subpackages=""
diff --git a/device/device-infocus-flatfish/APKBUILD b/device/device-infocus-flatfish/APKBUILD
index 46d052fc3..dd35c540d 100644
--- a/device/device-infocus-flatfish/APKBUILD
+++ b/device/device-infocus-flatfish/APKBUILD
@@ -2,12 +2,12 @@
 pkgname="device-infocus-flatfish"
 pkgdesc="InFocus New Tab F1"
 pkgver=0.1
-pkgrel=1
+pkgrel=2
 url="https://postmarketos.org"
 license="MIT"
 arch="noarch"
 options="!check"
-depends="linux-infocus-flatfish mkbootimg mesa-dri-swrast"
+depends="postmarketos-base linux-infocus-flatfish mkbootimg mesa-dri-swrast"
 makedepends="devicepkg-dev"
 source="
 	deviceinfo
diff --git a/device/device-jolla-sbj/APKBUILD b/device/device-jolla-sbj/APKBUILD
index 4b409feae..127441afc 100644
--- a/device/device-jolla-sbj/APKBUILD
+++ b/device/device-jolla-sbj/APKBUILD
@@ -2,12 +2,12 @@
 pkgname="device-jolla-sbj"
 pkgdesc="Jolla phone"
 pkgver=0.1
-pkgrel=0
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="noarch"
 options="!check"
-depends="linux-jolla-sbj mkbootimg mesa-dri-swrast msm-fb-refresher"
+depends="postmarketos-base linux-jolla-sbj mkbootimg mesa-dri-swrast msm-fb-refresher"
 makedepends="devicepkg-dev"
 source="deviceinfo"
 
diff --git a/device/device-leeco-s2/APKBUILD b/device/device-leeco-s2/APKBUILD
index dae424c1d..6381b15b4 100644
--- a/device/device-leeco-s2/APKBUILD
+++ b/device/device-leeco-s2/APKBUILD
@@ -2,12 +2,12 @@
 pkgname="device-leeco-s2"
 pkgdesc="LeEco Le 2"
 pkgver=0.1
-pkgrel=2
+pkgrel=3
 url="https://postmarketos.org"
 license="MIT"
 arch="noarch"
 options="!check"
-depends="linux-leeco-s2 mkbootimg msm-fb-refresher mesa-dri-swrast"
+depends="postmarketos-base linux-leeco-s2 mkbootimg msm-fb-refresher mesa-dri-swrast"
 makedepends="devicepkg-dev"
 source="deviceinfo"
 
diff --git a/device/device-lenovo-karate/APKBUILD b/device/device-lenovo-karate/APKBUILD
index 6c5646674..1e85422f3 100644
--- a/device/device-lenovo-karate/APKBUILD
+++ b/device/device-lenovo-karate/APKBUILD
@@ -1,12 +1,12 @@
 pkgname="device-lenovo-karate"
 pkgdesc="Lenovo K6 Power"
 pkgver=0.1
-pkgrel=2
+pkgrel=3
 url="https://postmarketos.org"
 license="MIT"
 arch="noarch"
 options="!check"
-depends="linux-lenovo-karate firmware-lenovo-karate mkbootimg mdss-fb-init-hack mesa-dri-swrast"
+depends="postmarketos-base 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/device/device-lg-bullhead/APKBUILD b/device/device-lg-bullhead/APKBUILD
index 40d9e2bce..fae32a22c 100644
--- a/device/device-lg-bullhead/APKBUILD
+++ b/device/device-lg-bullhead/APKBUILD
@@ -2,12 +2,12 @@
 pkgname="device-lg-bullhead"
 pkgdesc="Google Nexus 5X"
 pkgver=0.1
-pkgrel=0
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="noarch"
 options="!check"
-depends="linux-lg-bullhead mkbootimg mesa-dri-swrast libsparse msm-fb-refresher"
+depends="postmarketos-base linux-lg-bullhead mkbootimg mesa-dri-swrast libsparse msm-fb-refresher"
 makedepends="devicepkg-dev"
 source="deviceinfo"
 
diff --git a/device/device-lg-d285/APKBUILD b/device/device-lg-d285/APKBUILD
index 01a0b55d7..9010eaca1 100644
--- a/device/device-lg-d285/APKBUILD
+++ b/device/device-lg-d285/APKBUILD
@@ -1,11 +1,11 @@
 pkgname=device-lg-d285
 pkgver=1
-pkgrel=3
+pkgrel=4
 pkgdesc="LG L65"
 url="https://github.com/postmarketOS"
 arch="noarch"
 license="MIT"
-depends="linux-lg-d285 mkbootimg msm-fb-refresher mesa-dri-swrast"
+depends="postmarketos-base linux-lg-d285 mkbootimg msm-fb-refresher mesa-dri-swrast"
 makedepends=""
 install=""
 subpackages=""
diff --git a/device/device-lg-d855/APKBUILD b/device/device-lg-d855/APKBUILD
index ab59d79dc..d63685ea3 100644
--- a/device/device-lg-d855/APKBUILD
+++ b/device/device-lg-d855/APKBUILD
@@ -1,11 +1,11 @@
 pkgname=device-lg-d855
 pkgver=1
-pkgrel=12
+pkgrel=13
 pkgdesc="LG G3 International"
 url="https://github.com/postmarketOS"
 arch="noarch"
 license="MIT"
-depends="linux-lg-d855 mkbootimg mesa-dri-swrast"
+depends="postmarketos-base linux-lg-d855 mkbootimg mesa-dri-swrast"
 makedepends=""
 install=""
 subpackages=""
diff --git a/device/device-lg-dory/APKBUILD b/device/device-lg-dory/APKBUILD
index 56bbf08e9..92ccd1a68 100644
--- a/device/device-lg-dory/APKBUILD
+++ b/device/device-lg-dory/APKBUILD
@@ -1,11 +1,11 @@
 pkgname=device-lg-dory
 pkgver=1
-pkgrel=4
+pkgrel=5
 pkgdesc="LG G Watch"
 url="https://github.com/postmarketOS"
 arch="noarch"
 license="MIT"
-depends="linux-lg-dory mkbootimg msm-fb-refresher mesa-dri-swrast"
+depends="postmarketos-base linux-lg-dory mkbootimg msm-fb-refresher mesa-dri-swrast"
 makedepends=""
 install=""
 subpackages=""
diff --git a/device/device-lg-h815/APKBUILD b/device/device-lg-h815/APKBUILD
index 76ed3e399..aa8f24bba 100644
--- a/device/device-lg-h815/APKBUILD
+++ b/device/device-lg-h815/APKBUILD
@@ -2,12 +2,12 @@
 pkgname="device-lg-h815"
 pkgdesc="LG G4 (h815)"
 pkgver=0.1
-pkgrel=2
+pkgrel=3
 url="https://postmarketos.org"
 license="MIT"
 arch="noarch"
 options="!check"
-depends="linux-lg-h815 mkbootimg msm-fb-refresher mesa-dri-swrast"
+depends="postmarketos-base linux-lg-h815 mkbootimg msm-fb-refresher mesa-dri-swrast"
 makedepends="devicepkg-dev"
 source="deviceinfo"
 
diff --git a/device/device-lg-hammerhead/APKBUILD b/device/device-lg-hammerhead/APKBUILD
index 7ed94be97..b5ec622f4 100644
--- a/device/device-lg-hammerhead/APKBUILD
+++ b/device/device-lg-hammerhead/APKBUILD
@@ -1,11 +1,11 @@
 pkgname=device-lg-hammerhead
 pkgver=1
-pkgrel=17
+pkgrel=18
 pkgdesc="Google Nexus 5"
 url="https://github.com/postmarketOS"
 arch="noarch"
 license="MIT"
-depends="linux-lg-hammerhead linux-firmware mkbootimg msm-fb-refresher mesa-dri-swrast"
+depends="postmarketos-base linux-lg-hammerhead linux-firmware mkbootimg msm-fb-refresher mesa-dri-swrast"
 makedepends=""
 install=""
 subpackages="$pkgname-weston $pkgname-x11"
diff --git a/device/device-lg-lenok/APKBUILD b/device/device-lg-lenok/APKBUILD
index 96e31087d..2f41506ad 100644
--- a/device/device-lg-lenok/APKBUILD
+++ b/device/device-lg-lenok/APKBUILD
@@ -1,11 +1,11 @@
 pkgname=device-lg-lenok
 pkgver=1
-pkgrel=7
+pkgrel=8
 pkgdesc="LG G Watch R"
 url="https://github.com/postmarketOS"
 arch="noarch"
 license="MIT"
-depends="linux-lg-lenok mkbootimg mesa-dri-swrast"
+depends="postmarketos-base linux-lg-lenok mkbootimg mesa-dri-swrast"
 makedepends=""
 install=""
 subpackages=""
diff --git a/device/device-lg-mako/APKBUILD b/device/device-lg-mako/APKBUILD
index def6de72f..8fd700ec0 100644
--- a/device/device-lg-mako/APKBUILD
+++ b/device/device-lg-mako/APKBUILD
@@ -1,11 +1,11 @@
 pkgname=device-lg-mako
 pkgver=2
-pkgrel=16
+pkgrel=17
 pkgdesc="Google Nexus 4"
 url="https://github.com/postmarketOS"
 arch="noarch"
 license="MIT"
-depends="linux-lg-mako mkbootimg mesa-dri-swrast"
+depends="postmarketos-base linux-lg-mako mkbootimg mesa-dri-swrast"
 makedepends=""
 install=""
 subpackages="$pkgname-weston"
diff --git a/device/device-motorola-falcon/APKBUILD b/device/device-motorola-falcon/APKBUILD
index e54009db4..9af71b273 100644
--- a/device/device-motorola-falcon/APKBUILD
+++ b/device/device-motorola-falcon/APKBUILD
@@ -2,12 +2,12 @@
 pkgname="device-motorola-falcon"
 pkgdesc="Moto G (2013)"
 pkgver=0.1
-pkgrel=0
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="noarch"
 options="!check"
-depends="linux-motorola-falcon mkbootimg mesa-dri-swrast msm-fb-refresher"
+depends="postmarketos-base linux-motorola-falcon mkbootimg mesa-dri-swrast msm-fb-refresher"
 makedepends="devicepkg-dev"
 source="deviceinfo"
 
diff --git a/device/device-motorola-osprey/APKBUILD b/device/device-motorola-osprey/APKBUILD
index 9c32b4f78..59196b722 100644
--- a/device/device-motorola-osprey/APKBUILD
+++ b/device/device-motorola-osprey/APKBUILD
@@ -1,11 +1,11 @@
 pkgname=device-motorola-osprey
 pkgver=1
-pkgrel=4
+pkgrel=5
 pkgdesc="Motorola Moto G 3rd gen. (2015)"
 url="https://github.com/postmarketOS"
 arch="noarch"
 license="MIT"
-depends="linux-motorola-osprey mkbootimg mesa-dri-swrast"
+depends="postmarketos-base linux-motorola-osprey mkbootimg mesa-dri-swrast"
 makedepends=""
 install=""
 subpackages=""
diff --git a/device/device-motorola-potter/APKBUILD b/device/device-motorola-potter/APKBUILD
index 74cf21004..3d5d09ed5 100644
--- a/device/device-motorola-potter/APKBUILD
+++ b/device/device-motorola-potter/APKBUILD
@@ -2,12 +2,12 @@
 pkgname="device-motorola-potter"
 pkgdesc="Motorola Moto G5 Plus"
 pkgver=0.1
-pkgrel=2
+pkgrel=3
 url="https://postmarketos.org"
 license="MIT"
 arch="noarch"
 options="!check"
-depends="linux-motorola-potter mkbootimg mesa-dri-swrast msm-fb-refresher"
+depends="postmarketos-base linux-motorola-potter mkbootimg mesa-dri-swrast msm-fb-refresher"
 makedepends="devicepkg-dev"
 source="deviceinfo"
 
diff --git a/device/device-motorola-shamu/APKBUILD b/device/device-motorola-shamu/APKBUILD
index 8fb42bc2e..d9ab31f67 100644
--- a/device/device-motorola-shamu/APKBUILD
+++ b/device/device-motorola-shamu/APKBUILD
@@ -2,12 +2,12 @@
 pkgname="device-motorola-shamu"
 pkgdesc="Motorola Google Nexus 6"
 pkgver=0.3
-pkgrel=1
+pkgrel=2
 url="https://postmarketos.org"
 license="MIT"
 arch="noarch"
 options="!check"
-depends="linux-motorola-shamu mkbootimg mesa-dri-swrast msm-fb-refresher"
+depends="postmarketos-base linux-motorola-shamu mkbootimg mesa-dri-swrast msm-fb-refresher"
 makedepends="devicepkg-dev"
 source="deviceinfo initfs-hook.sh"
 
diff --git a/device/device-motorola-titan/APKBUILD b/device/device-motorola-titan/APKBUILD
index 5693d4e43..121f945ae 100644
--- a/device/device-motorola-titan/APKBUILD
+++ b/device/device-motorola-titan/APKBUILD
@@ -1,11 +1,11 @@
 pkgname=device-motorola-titan
 pkgver=1
-pkgrel=20
+pkgrel=21
 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 mesa-dri-swrast"
+depends="postmarketos-base linux-motorola-titan firmware-motorola-titan mkbootimg msm-fb-refresher mesa-dri-swrast"
 makedepends=""
 install="$pkgname.post-install"
 subpackages="$pkgname-weston"
diff --git a/device/device-nextbit-robin/APKBUILD b/device/device-nextbit-robin/APKBUILD
index 106dba576..7fde32d60 100644
--- a/device/device-nextbit-robin/APKBUILD
+++ b/device/device-nextbit-robin/APKBUILD
@@ -2,12 +2,12 @@
 pkgname="device-nextbit-robin"
 pkgdesc="Nextbit Robin"
 pkgver=0.1
-pkgrel=1
+pkgrel=2
 url="https://postmarketos.org"
 license="MIT"
 arch="noarch"
 options="!check"
-depends="linux-nextbit-robin mkbootimg msm-fb-refresher mesa-dri-swrast"
+depends="postmarketos-base linux-nextbit-robin mkbootimg msm-fb-refresher mesa-dri-swrast"
 makedepends="devicepkg-dev"
 source="deviceinfo"
 
diff --git a/device/device-nokia-n9/APKBUILD b/device/device-nokia-n9/APKBUILD
index 64d85282e..338d63ffb 100644
--- a/device/device-nokia-n9/APKBUILD
+++ b/device/device-nokia-n9/APKBUILD
@@ -1,11 +1,11 @@
 pkgname=device-nokia-n9
 pkgver=1
-pkgrel=0
+pkgrel=1
 pkgdesc="Nokia N9"
 url="https://github.com/postmarketOS"
 arch="noarch"
 license="MIT"
-depends="linux-nokia-n9 linux-firmware ofono watchdog-kick"
+depends="postmarketos-base linux-nokia-n9 linux-firmware ofono watchdog-kick"
 makedepends=""
 install=""
 subpackages="$pkgname-weston:weston"
diff --git a/device/device-nokia-n900/APKBUILD b/device/device-nokia-n900/APKBUILD
index 9b7dfd1c4..b372aee04 100644
--- a/device/device-nokia-n900/APKBUILD
+++ b/device/device-nokia-n900/APKBUILD
@@ -1,11 +1,11 @@
 pkgname=device-nokia-n900
 pkgver=2
-pkgrel=0
+pkgrel=1
 pkgdesc="Nokia N900"
 url="https://github.com/postmarketOS"
 arch="noarch"
 license="MIT"
-depends="linux-postmarketos-stable uboot-tools linux-firmware kbd kbd-bkeymaps ofono mesa-dri-swrast"
+depends="postmarketos-base 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 $pkgname-x11 $pkgname-i3wm"
diff --git a/device/device-oneplus-bacon/APKBUILD b/device/device-oneplus-bacon/APKBUILD
index 735b1f78d..d3be08bf3 100644
--- a/device/device-oneplus-bacon/APKBUILD
+++ b/device/device-oneplus-bacon/APKBUILD
@@ -1,11 +1,11 @@
 pkgname=device-oneplus-bacon
 pkgver=1
-pkgrel=8
+pkgrel=9
 pkgdesc="OnePlus One"
 url="https://github.com/postmarketOS"
 arch="noarch"
 license="MIT"
-depends="linux-oneplus-bacon linux-firmware mkbootimg mesa-dri-swrast"
+depends="postmarketos-base linux-oneplus-bacon linux-firmware mkbootimg mesa-dri-swrast"
 makedepends=""
 install=""
 subpackages="$pkgname-weston"
diff --git a/device/device-oneplus-onyx/APKBUILD b/device/device-oneplus-onyx/APKBUILD
index 6bc566cb5..60a71692e 100644
--- a/device/device-oneplus-onyx/APKBUILD
+++ b/device/device-oneplus-onyx/APKBUILD
@@ -1,11 +1,11 @@
 pkgname=device-oneplus-onyx
 pkgver=1
-pkgrel=2
+pkgrel=3
 pkgdesc="OnePlus X"
 url="https://github.com/postmarketOS"
 arch="noarch"
 license="MIT"
-depends="linux-oneplus-onyx linux-firmware mkbootimg msm-fb-refresher mesa-dri-swrast"
+depends="postmarketos-base 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/device/device-qemu-aarch64/APKBUILD b/device/device-qemu-aarch64/APKBUILD
index 024f89a88..6bf0ce35f 100644
--- a/device/device-qemu-aarch64/APKBUILD
+++ b/device/device-qemu-aarch64/APKBUILD
@@ -1,12 +1,12 @@
 pkgname=device-qemu-aarch64
 pkgver=1
-pkgrel=9
+pkgrel=10
 pkgdesc="Simulated device in qemu with vexpress soc"
 url="https://github.com/postmarketOS"
 arch="noarch"
 license="MIT"
 # NOTE: 'pmbootstrap init' allows you to choose the mesa-dri-* package
-depends="linux-postmarketos-stable"
+depends="postmarketos-base linux-postmarketos-stable"
 makedepends=""
 subpackages="$pkgname-weston"
 source="deviceinfo interfaces weston.ini"
diff --git a/device/device-qemu-amd64/APKBUILD b/device/device-qemu-amd64/APKBUILD
index 4d72ccb8f..2b4947784 100644
--- a/device/device-qemu-amd64/APKBUILD
+++ b/device/device-qemu-amd64/APKBUILD
@@ -1,12 +1,12 @@
 pkgname=device-qemu-amd64
 pkgver=1
-pkgrel=13
+pkgrel=14
 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"
+depends="postmarketos-base linux-postmarketos-lts"
 makedepends=""
 subpackages="$pkgname-x11 $pkgname-weston"
 source="deviceinfo interfaces weston.ini"
diff --git a/device/device-qemu-vexpress/APKBUILD b/device/device-qemu-vexpress/APKBUILD
index efd8622b0..cfe82496d 100644
--- a/device/device-qemu-vexpress/APKBUILD
+++ b/device/device-qemu-vexpress/APKBUILD
@@ -1,12 +1,12 @@
 pkgname=device-qemu-vexpress
 pkgver=1
-pkgrel=16
+pkgrel=17
 pkgdesc="Simulated device in qemu with vexpress soc"
 url="https://github.com/postmarketOS"
 arch="noarch"
 license="MIT"
 # NOTE: 'pmbootstrap init' allows you to choose the mesa-dri-* package
-depends="linux-postmarketos-lts"
+depends="postmarketos-base linux-postmarketos-lts"
 makedepends=""
 subpackages=""
 source="deviceinfo interfaces"
diff --git a/device/device-samsung-espresso10/APKBUILD b/device/device-samsung-espresso10/APKBUILD
index c82941cac..17638483a 100644
--- a/device/device-samsung-espresso10/APKBUILD
+++ b/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=3
+pkgrel=4
 url="https://postmarketos.org"
 license="MIT"
 arch="noarch"
 options="!check"
-depends="linux-samsung-espresso10 firmware-samsung-espresso10 mkbootimg mesa-dri-swrast"
+depends="postmarketos-base linux-samsung-espresso10 firmware-samsung-espresso10 mkbootimg mesa-dri-swrast"
 makedepends="devicepkg-dev"
 source="deviceinfo"
 
diff --git a/device/device-samsung-i747m/APKBUILD b/device/device-samsung-i747m/APKBUILD
index 88c4c9beb..d10e8f092 100644
--- a/device/device-samsung-i747m/APKBUILD
+++ b/device/device-samsung-i747m/APKBUILD
@@ -1,12 +1,12 @@
 pkgname="device-samsung-i747m"
 pkgdesc="Samsing Galaxy SIII (USA/Canada)"
 pkgver=0.1
-pkgrel=2
+pkgrel=3
 url="https://postmarketos.org"
 license="MIT"
 arch="noarch"
 options="!check"
-depends="linux-samsung-i747m firmware-samsung-i747m mkbootimg mesa-dri-swrast"
+depends="postmarketos-base linux-samsung-i747m firmware-samsung-i747m mkbootimg mesa-dri-swrast"
 source="deviceinfo 90-android-touch-dev.rules fb.modes"
 
 package() {
diff --git a/device/device-samsung-i9003/APKBUILD b/device/device-samsung-i9003/APKBUILD
index ae0c68cca..b3ec0c01d 100644
--- a/device/device-samsung-i9003/APKBUILD
+++ b/device/device-samsung-i9003/APKBUILD
@@ -1,11 +1,11 @@
 pkgname=device-samsung-i9003
 pkgver=1
-pkgrel=16
+pkgrel=17
 pkgdesc="Samsung Galaxy SI SLC"
 url="https://github.com/postmarketOS"
 arch="noarch"
 license="MIT"
-depends="linux-samsung-i9003 libsamsung-ipc mkbootimg mesa-dri-swrast"
+depends="postmarketos-base linux-samsung-i9003 libsamsung-ipc mkbootimg mesa-dri-swrast"
 makedepends=""
 install=""
 subpackages=""
diff --git a/device/device-samsung-i9070/APKBUILD b/device/device-samsung-i9070/APKBUILD
index 93d8c2604..6b8d3356c 100644
--- a/device/device-samsung-i9070/APKBUILD
+++ b/device/device-samsung-i9070/APKBUILD
@@ -1,12 +1,12 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-samsung-i9070
 pkgver=1
-pkgrel=20
+pkgrel=21
 pkgdesc="Samsung Galaxy S Advance"
 url="https://github.com/postmarketOS"
 arch="noarch"
 license="MIT"
-depends="linux-samsung-i9070 firmware-samsung-i9070 mesa-dri-swrast"
+depends="postmarketos-base linux-samsung-i9070 firmware-samsung-i9070 mesa-dri-swrast"
 makedepends="devicepkg-dev"
 install=""
 subpackages=""
diff --git a/device/device-samsung-i9100/APKBUILD b/device/device-samsung-i9100/APKBUILD
index fbfe0024c..469185b79 100644
--- a/device/device-samsung-i9100/APKBUILD
+++ b/device/device-samsung-i9100/APKBUILD
@@ -1,11 +1,11 @@
 pkgname=device-samsung-i9100
 pkgver=1
-pkgrel=17
+pkgrel=18
 pkgdesc="Samsung Galaxy SII"
 url="https://github.com/postmarketOS"
 arch="noarch"
 license="MIT"
-depends="linux-samsung-i9100 firmware-samsung-i9100 libsamsung-ipc mesa-dri-swrast"
+depends="postmarketos-base linux-samsung-i9100 firmware-samsung-i9100 libsamsung-ipc mesa-dri-swrast"
 makedepends=""
 install="$pkgname.post-install"
 subpackages=""
diff --git a/device/device-samsung-i9195/APKBUILD b/device/device-samsung-i9195/APKBUILD
index 87723cc23..edcd0e495 100644
--- a/device/device-samsung-i9195/APKBUILD
+++ b/device/device-samsung-i9195/APKBUILD
@@ -2,12 +2,12 @@
 pkgname="device-samsung-i9195"
 pkgdesc="Samsung Galaxy S4 Mini"
 pkgver=0.2
-pkgrel=1
+pkgrel=2
 url="https://postmarketos.org"
 license="MIT"
 arch="noarch"
 options="!check"
-depends="linux-samsung-i9195 mkbootimg"
+depends="postmarketos-base linux-samsung-i9195 mkbootimg"
 makedepends="devicepkg-dev"
 source="deviceinfo"
 
diff --git a/device/device-samsung-i9305/APKBUILD b/device/device-samsung-i9305/APKBUILD
index dd042820a..ea553cf83 100644
--- a/device/device-samsung-i9305/APKBUILD
+++ b/device/device-samsung-i9305/APKBUILD
@@ -1,11 +1,11 @@
 pkgname=device-samsung-i9305
 pkgver=1
-pkgrel=16
+pkgrel=17
 pkgdesc="Samsung Galaxy SIII LTE"
 url="https://github.com/postmarketOS"
 arch="noarch"
 license="MIT"
-depends="linux-samsung-i9305 firmware-samsung-i9305 mkbootimg mesa-dri-swrast"
+depends="postmarketos-base linux-samsung-i9305 firmware-samsung-i9305 mkbootimg mesa-dri-swrast"
 makedepends=""
 install="$pkgname.post-install"
 subpackages=""
diff --git a/device/device-samsung-i9505/APKBUILD b/device/device-samsung-i9505/APKBUILD
index 40306ca18..91af122b6 100644
--- a/device/device-samsung-i9505/APKBUILD
+++ b/device/device-samsung-i9505/APKBUILD
@@ -1,12 +1,12 @@
 pkgname="device-samsung-i9505"
 pkgdesc="Samsung Galaxy S4 International"
 pkgver=0.4
-pkgrel=2
+pkgrel=3
 url="https://postmarketos.org"
 license="MIT"
 arch="noarch"
 options="!check"
-depends="linux-samsung-i9505 firmware-samsung-i9505 mkbootimg mesa-dri-swrast"
+depends="postmarketos-base linux-samsung-i9505 firmware-samsung-i9505 mkbootimg mesa-dri-swrast"
 source="deviceinfo 90-android-sec_touchscreen.rules"
 
 package() {
diff --git a/device/device-samsung-klte/APKBUILD b/device/device-samsung-klte/APKBUILD
index 556b428a3..be0e9cff8 100644
--- a/device/device-samsung-klte/APKBUILD
+++ b/device/device-samsung-klte/APKBUILD
@@ -1,12 +1,12 @@
 pkgname="device-samsung-klte"
 pkgdesc="Samsung Galaxy S5"
 pkgver=0.1
-pkgrel=0
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="noarch"
 options="!check"
-depends="linux-samsung-klte mkbootimg msm-fb-refresher"
+depends="postmarketos-base linux-samsung-klte mkbootimg msm-fb-refresher"
 makedepends="devicepkg-dev"
 source="deviceinfo"
 
diff --git a/device/device-samsung-maguro/APKBUILD b/device/device-samsung-maguro/APKBUILD
index 89226d637..f7fc1b6ae 100644
--- a/device/device-samsung-maguro/APKBUILD
+++ b/device/device-samsung-maguro/APKBUILD
@@ -1,12 +1,12 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-samsung-maguro
 pkgver=2
-pkgrel=17
+pkgrel=18
 pkgdesc="Google Galaxy Nexus (GSM)"
 url="https://github.com/postmarketOS"
 arch="noarch"
 license="MIT"
-depends="linux-samsung-maguro mkbootimg firmware-samsung-maguro mesa-dri-swrast"
+depends="postmarketos-base linux-samsung-maguro mkbootimg firmware-samsung-maguro mesa-dri-swrast"
 makedepends="devicepkg-dev"
 install=""
 subpackages=""
diff --git a/device/device-samsung-manta/APKBUILD b/device/device-samsung-manta/APKBUILD
index 2e275921f..b2377edb5 100644
--- a/device/device-samsung-manta/APKBUILD
+++ b/device/device-samsung-manta/APKBUILD
@@ -2,12 +2,12 @@
 pkgname="device-samsung-manta"
 pkgdesc="Google Nexus 10"
 pkgver=0.1
-pkgrel=1
+pkgrel=2
 url="https://postmarketos.org"
 license="MIT"
 arch="noarch"
 options="!check"
-depends="linux-samsung-manta mkbootimg mesa-dri-swrast watchdog-kick"
+depends="postmarketos-base linux-samsung-manta mkbootimg mesa-dri-swrast watchdog-kick"
 makedepends="devicepkg-dev"
 source="deviceinfo"
 
diff --git a/device/device-samsung-n5110/APKBUILD b/device/device-samsung-n5110/APKBUILD
index a4d9caf5b..78f9b113b 100644
--- a/device/device-samsung-n5110/APKBUILD
+++ b/device/device-samsung-n5110/APKBUILD
@@ -2,12 +2,12 @@
 pkgname="device-samsung-n5110"
 pkgdesc="Samsung Galaxy Note 8.0 (Wi-Fi)"
 pkgver=0.1
-pkgrel=0
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="noarch"
 options="!check"
-depends="linux-samsung-n5110 mkbootimg mesa-dri-swrast"
+depends="postmarketos-base linux-samsung-n5110 mkbootimg mesa-dri-swrast"
 makedepends="devicepkg-dev"
 source="deviceinfo pointercal asound.state Kona_WM1811/hifi.conf Kona_WM1811/Kona_WM1811.conf Kona_WM1811/lp.conf 90-$pkgname.rules"
 
diff --git a/device/device-samsung-n7100/APKBUILD b/device/device-samsung-n7100/APKBUILD
index e530aa7dc..fa2614cf4 100644
--- a/device/device-samsung-n7100/APKBUILD
+++ b/device/device-samsung-n7100/APKBUILD
@@ -1,11 +1,11 @@
 pkgname=device-samsung-n7100
 pkgver=1
-pkgrel=13
+pkgrel=14
 pkgdesc="Samsung Galaxy Note II (GSM)"
 url="https://github.com/postmarketOS"
 arch="noarch"
 license="MIT"
-depends="linux-samsung-n7100 mkbootimg mesa-dri-swrast"
+depends="postmarketos-base linux-samsung-n7100 mkbootimg mesa-dri-swrast"
 makedepends=""
 install=""
 subpackages=""
diff --git a/device/device-samsung-s6500d/APKBUILD b/device/device-samsung-s6500d/APKBUILD
index 171a1b203..0cc4276e7 100644
--- a/device/device-samsung-s6500d/APKBUILD
+++ b/device/device-samsung-s6500d/APKBUILD
@@ -2,12 +2,12 @@
 pkgname="device-samsung-s6500d"
 pkgdesc="Samsung Galaxy Mini 2"
 pkgver=0.1
-pkgrel=2
+pkgrel=3
 url="https://postmarketos.org"
 license="MIT"
 arch="noarch"
 options="!check"
-depends="linux-samsung-s6500d mkbootimg mesa-dri-swrast"
+depends="postmarketos-base linux-samsung-s6500d mkbootimg mesa-dri-swrast"
 makedepends="devicepkg-dev"
 source="deviceinfo"
 
diff --git a/device/device-semc-anzu/APKBUILD b/device/device-semc-anzu/APKBUILD
index 6b5651e53..28cb46e5e 100644
--- a/device/device-semc-anzu/APKBUILD
+++ b/device/device-semc-anzu/APKBUILD
@@ -2,12 +2,12 @@
 pkgname=device-semc-anzu
 pkgdesc="Xperia Arc"
 pkgver=1
-pkgrel=1
+pkgrel=2
 url="https://postmarketos.org"
 license="MIT"
 arch="noarch"
 options="!check"
-depends="linux-semc-anzu linux-firmware msm-fb-refresher mkbootimg libsparse mesa-dri-swrast"
+depends="postmarketos-base linux-semc-anzu linux-firmware msm-fb-refresher mkbootimg libsparse mesa-dri-swrast"
 makedepends="devicepkg-dev"
 source="
 	deviceinfo
diff --git a/device/device-sony-amami/APKBUILD b/device/device-sony-amami/APKBUILD
index 822a940e4..c63df9427 100644
--- a/device/device-sony-amami/APKBUILD
+++ b/device/device-sony-amami/APKBUILD
@@ -1,11 +1,11 @@
 pkgname=device-sony-amami
 pkgver=1
-pkgrel=16
+pkgrel=17
 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 mesa-dri-swrast"
+depends="postmarketos-base linux-sony-amami mkbootimg mdss-fb-init-hack firmware-sony-amami mesa-dri-swrast"
 makedepends=""
 install=""
 subpackages=""
diff --git a/device/device-sony-aries/APKBUILD b/device/device-sony-aries/APKBUILD
index 9198cd2c8..c1a7b4b9a 100644
--- a/device/device-sony-aries/APKBUILD
+++ b/device/device-sony-aries/APKBUILD
@@ -1,11 +1,11 @@
 pkgname=device-sony-aries
 pkgver=1
-pkgrel=14
+pkgrel=15
 pkgdesc="Sony Xperia Z3 Compact"
 url="https://github.com/postmarketOS"
 arch="noarch"
 license="MIT"
-depends="linux-sony-aries mkbootimg mesa-dri-swrast"
+depends="postmarketos-base linux-sony-aries mkbootimg mesa-dri-swrast"
 makedepends=""
 install=""
 subpackages=""
diff --git a/device/device-sony-castor-windy/APKBUILD b/device/device-sony-castor-windy/APKBUILD
index 042e8f242..f8b34155d 100644
--- a/device/device-sony-castor-windy/APKBUILD
+++ b/device/device-sony-castor-windy/APKBUILD
@@ -1,11 +1,11 @@
 pkgname=device-sony-castor-windy
 pkgver=1
-pkgrel=10
+pkgrel=11
 pkgdesc="Sony Xperia Z2 Tablet WIFI"
 url="https://github.com/postmarketOS"
 arch="noarch"
 license="MIT"
-depends="mkbootimg linux-sony-castor-windy linux-firmware mesa-dri-freedreno firmware-adreno"
+depends="postmarketos-base mkbootimg linux-sony-castor-windy linux-firmware mesa-dri-freedreno firmware-adreno"
 makedepends=""
 install=""
 subpackages=""
diff --git a/device/device-sony-honami/APKBUILD b/device/device-sony-honami/APKBUILD
index 4455fe766..4a0317a02 100644
--- a/device/device-sony-honami/APKBUILD
+++ b/device/device-sony-honami/APKBUILD
@@ -1,12 +1,12 @@
 pkgname="device-sony-honami"
 pkgdesc="Sony Xperia Z1"
 pkgver=1.0
-pkgrel=2
+pkgrel=3
 url="https://postmarketos.org"
 license="MIT"
 arch="noarch"
 options="!check"
-depends="linux-sony-honami firmware-sony-amami msm-fb-refresher mkbootimg mesa-dri-swrast"
+depends="postmarketos-base linux-sony-honami firmware-sony-amami msm-fb-refresher mkbootimg mesa-dri-swrast"
 source="deviceinfo 90-android-touch-dev.rules"
 
 package() {
diff --git a/device/device-sony-scorpion/APKBUILD b/device/device-sony-scorpion/APKBUILD
index 3cc5fd10d..ab02259a8 100644
--- a/device/device-sony-scorpion/APKBUILD
+++ b/device/device-sony-scorpion/APKBUILD
@@ -2,12 +2,12 @@
 pkgname="device-sony-scorpion"
 pkgdesc="Xperia Z3 Tablet Compact"
 pkgver=0.1
-pkgrel=0
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="noarch"
 options="!check"
-depends="linux-sony-scorpion mkbootimg mesa-dri-swrast msm-fb-refresher"
+depends="postmarketos-base linux-sony-scorpion mkbootimg mesa-dri-swrast msm-fb-refresher"
 makedepends="devicepkg-dev"
 source="deviceinfo"
 
diff --git a/device/device-sony-yuga/APKBUILD b/device/device-sony-yuga/APKBUILD
index bf3e41559..10d4a5516 100644
--- a/device/device-sony-yuga/APKBUILD
+++ b/device/device-sony-yuga/APKBUILD
@@ -1,11 +1,11 @@
 pkgname=device-sony-yuga
 pkgver=1
-pkgrel=8
+pkgrel=9
 pkgdesc="Sony Xperia Z"
 url="https://github.com/postmarketOS"
 arch="noarch"
 license="MIT"
-depends="linux-sony-yuga mkbootimg mesa-dri-swrast"
+depends="postmarketos-base linux-sony-yuga mkbootimg mesa-dri-swrast"
 makedepends=""
 install=""
 subpackages=""
diff --git a/device/device-t2m-flame/APKBUILD b/device/device-t2m-flame/APKBUILD
index 5a87b3751..7a622ab23 100644
--- a/device/device-t2m-flame/APKBUILD
+++ b/device/device-t2m-flame/APKBUILD
@@ -1,11 +1,11 @@
 pkgname=device-t2m-flame
 pkgver=1
-pkgrel=9
+pkgrel=10
 pkgdesc="Mozilla Flame"
 url="https://github.com/postmarketOS"
 arch="noarch"
 license="MIT"
-depends="linux-t2m-flame firmware-t2m-flame mkbootimg mesa-dri-swrast"
+depends="postmarketos-base linux-t2m-flame firmware-t2m-flame mkbootimg mesa-dri-swrast"
 makedepends=""
 install="$pkgname.post-install"
 source="deviceinfo 90-android-touch-dev.rules $install"
diff --git a/device/device-teclast-x80pro/APKBUILD b/device/device-teclast-x80pro/APKBUILD
index 1705cccc5..bd83b42e3 100644
--- a/device/device-teclast-x80pro/APKBUILD
+++ b/device/device-teclast-x80pro/APKBUILD
@@ -4,12 +4,12 @@
 pkgname="device-teclast-x80pro"
 pkgdesc="Teclast X80Pro"
 pkgver=1.0
-pkgrel=1
+pkgrel=2
 url="https://postmarketos.org"
 license="MIT"
 arch="noarch"
 options="!check"
-depends="linux-teclast-x80pro linux-firmware"
+depends="postmarketos-base linux-teclast-x80pro linux-firmware"
 makedepends="devicepkg-dev"
 source="deviceinfo"
 
diff --git a/device/device-wiko-lenny3/APKBUILD b/device/device-wiko-lenny3/APKBUILD
index e608dd0f6..b36fcda91 100644
--- a/device/device-wiko-lenny3/APKBUILD
+++ b/device/device-wiko-lenny3/APKBUILD
@@ -1,12 +1,12 @@
 pkgname="device-wiko-lenny3"
 pkgdesc="Lenny 3"
 pkgver=0.1
-pkgrel=2
+pkgrel=3
 url="https://postmarketos.org"
 license="MIT"
 arch="noarch"
 options="!check"
-depends="linux-wiko-lenny3 mkbootimg mesa-dri-swrast"
+depends="postmarketos-base linux-wiko-lenny3 mkbootimg mesa-dri-swrast"
 source="deviceinfo"
 
 package() {
diff --git a/device/device-xiaomi-armani/APKBUILD b/device/device-xiaomi-armani/APKBUILD
index 6732df540..9104cea49 100644
--- a/device/device-xiaomi-armani/APKBUILD
+++ b/device/device-xiaomi-armani/APKBUILD
@@ -2,12 +2,12 @@
 pkgname="device-xiaomi-armani"
 pkgdesc="Redmi 1S"
 pkgver=0.1
-pkgrel=0
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="noarch"
 options="!check"
-depends="linux-xiaomi-armani mkbootimg mesa-dri-swrast msm-fb-refresher firmware-xiaomi-armani"
+depends="postmarketos-base linux-xiaomi-armani mkbootimg mesa-dri-swrast msm-fb-refresher firmware-xiaomi-armani"
 makedepends="devicepkg-dev"
 install="$pkgname.post-install $pkgname.pre-deinstall"
 source="deviceinfo
diff --git a/device/device-xiaomi-ido/APKBUILD b/device/device-xiaomi-ido/APKBUILD
index e3a72b03a..e00a43182 100644
--- a/device/device-xiaomi-ido/APKBUILD
+++ b/device/device-xiaomi-ido/APKBUILD
@@ -2,12 +2,12 @@
 pkgname="device-xiaomi-ido"
 pkgdesc="Xiaomi Xiaomi RedMi 3"
 pkgver=0.1
-pkgrel=2
+pkgrel=3
 url="https://postmarketos.org"
 license="MIT"
 arch="noarch"
 options="!check"
-depends="linux-xiaomi-ido mkbootimg mesa-dri-swrast"
+depends="postmarketos-base linux-xiaomi-ido mkbootimg mesa-dri-swrast"
 makedepends="devicepkg-dev"
 source="deviceinfo
 	fb.modes
diff --git a/main/msm-fb-refresher/APKBUILD b/main/msm-fb-refresher/APKBUILD
index 71d822997..6ea1eeedb 100644
--- a/main/msm-fb-refresher/APKBUILD
+++ b/main/msm-fb-refresher/APKBUILD
@@ -1,11 +1,12 @@
 pkgname=msm-fb-refresher
 pkgver=0.1
-pkgrel=0
+pkgrel=1
 pkgdesc="Display refresher for Qualcomm devices"
 arch="all"
 url="https://github.com/AsteroidOS/msm-fb-refresher"
 license="GPL2"
 makedepends="linux-headers"
+install="$pkgname.post-install"
 source="
 	${pkgname}-${pkgver}.tar.gz::https://github.com/AsteroidOS/msm-fb-refresher/archive/v${pkgver}.tar.gz
 	msm-fb-refresher.init
diff --git a/main/msm-fb-refresher/msm-fb-refresher.post-install b/main/msm-fb-refresher/msm-fb-refresher.post-install
new file mode 100644
index 000000000..95021e9cf
--- /dev/null
+++ b/main/msm-fb-refresher/msm-fb-refresher.post-install
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+rc-update -q add msm-fb-refresher boot
diff --git a/main/postmarketos-base/APKBUILD b/main/postmarketos-base/APKBUILD
index 3aaa10ac7..730353eb1 100644
--- a/main/postmarketos-base/APKBUILD
+++ b/main/postmarketos-base/APKBUILD
@@ -1,6 +1,6 @@
 pkgname=postmarketos-base
 pkgver=3
-pkgrel=13
+pkgrel=14
 pkgdesc="Meta package for minimal postmarketOS base"
 url="https://github.com/postmarketOS"
 arch="noarch"
@@ -30,8 +30,7 @@ source="
 	50-firmware.rules
 	swapfile/swapfile
 	swapfile/swapfile.init
-	swapfile/swapfile.conf
-	$install"
+	swapfile/swapfile.conf"
 options="!check"
 
 package() {
@@ -65,5 +64,4 @@ sha512sums="38dc75c0ed32b76dccd3d8e7e8173e8b7d91847cf2b07123f376b95af46b4f89798b
 0b098828080055d3646ea54891cb0e1b578cbc30f5e16f7284f2814c08192f18079a38fb686d192715ae6a3d2cd6625d9e3cf99f234a6f0d94088bb0cb2ce43d  50-firmware.rules
 3ceeee37f558e7c95ad973692b6a437f997e6b46c3d1c2257ddfb1529a5633477373aa123c7f08164e818daae50acb203d151379f27ca11bd458809e6a0d4de7  swapfile
 f5cc0f1265955d2646e5f099dd4b5d4c287945bfc18c16044db57670d456f55c678fc11cc59e6dab3fa340832ce869d516302a3a35c13518539ed0cedca51819  swapfile.init
-e0d2d48b82a03239a4c0a00acaf83e00d397c23a8d7c71053d4e2a383357c22dcedef9e81b0e12a1d7514e1fdbe0bb3eb82613d18b29034a7ce5447f13c84a53  swapfile.conf
-76f0410cf51a991d1c2caacc1a7ea6b7b1075fad7405167a82fd1e980b2c00b840991374b0799fb29fbd53d81a61cbbdaac2f915c9d5696cd84c6f4de28c5cb2  postmarketos-base.post-install"
+e0d2d48b82a03239a4c0a00acaf83e00d397c23a8d7c71053d4e2a383357c22dcedef9e81b0e12a1d7514e1fdbe0bb3eb82613d18b29034a7ce5447f13c84a53  swapfile.conf"
diff --git a/main/postmarketos-base/postmarketos-base.post-install b/main/postmarketos-base/postmarketos-base.post-install
index 0c4f21305..a67ec4412 100644
--- a/main/postmarketos-base/postmarketos-base.post-install
+++ b/main/postmarketos-base/postmarketos-base.post-install
@@ -1,7 +1,5 @@
 #!/bin/sh
 
-. /etc/deviceinfo
-
 # Enable udev OpenRC services and runlevels
 # https://github.com/alpinelinux/aports/blob/master/main/eudev/setup-udev
 setup-udev -n
@@ -19,9 +17,6 @@ done
 for service in mount-ro killprocs savecache; do
 	rc-update -q add $service shutdown
 done
-if [ "${deviceinfo_msm_refresher}" = "true" ]; then
-	rc-update -q add msm-fb-refresher boot
-fi
 
 # Prime swclock with a reasonable date/time on first boot
 mkdir -p /run/openrc