diff --git a/main/devicepkg-utils/APKBUILD b/main/devicepkg-utils/APKBUILD
index 06a5e6eff..14573a7f5 100644
--- a/main/devicepkg-utils/APKBUILD
+++ b/main/devicepkg-utils/APKBUILD
@@ -1,5 +1,5 @@
 pkgname=devicepkg-utils
-pkgver=0.1.0
+pkgver=0.2.0
 pkgrel=0
 pkgdesc="Utilities for interacting with device packages"
 url="https://postmarketos.org"
@@ -12,5 +12,5 @@ package() {
 	install -Dm644 "$srcdir"/source_deviceinfo -t "$pkgdir"/usr/share/misc
 }
 sha512sums="
-c80da33257e6251d46c71d6188b31ab564200269f7b9e4583a117aa14a5a0f2b57e9c5d0e0d7acdbb69d064313b06283d99fdb7417abaeaea36ccde1631d569e  source_deviceinfo
+a6e4f57280bed21fe3ac480eaa582c14fa8337d77386ff92c3e271818b5a028cac2a4f557ecfe9f7432e23a6dadd33bdc6b429a0e5e29cce2602b2a6e58a8bdd  source_deviceinfo
 "
diff --git a/main/devicepkg-utils/source_deviceinfo b/main/devicepkg-utils/source_deviceinfo
index 298c1b8e4..c7c7ac412 100644
--- a/main/devicepkg-utils/source_deviceinfo
+++ b/main/devicepkg-utils/source_deviceinfo
@@ -1,3 +1,6 @@
-# This script must be sourced (not executed) to work properly
+# These scripts must be sourced (not executed) to work properly
 # shellcheck disable=SC1091
-. /etc/deviceinfo
+[ -f /usr/share/deviceinfo/deviceinfo ] && . /usr/share/deviceinfo/deviceinfo
+[ -f /etc/deviceinfo ] && . /etc/deviceinfo
+
+[ -z "$deviceinfo_arch" ] && { echo "$0: ERROR: deviceinfo file is missing!!"; exit 1; } || true