diff --git a/main/devicepkg-utils/APKBUILD b/main/devicepkg-utils/APKBUILD
index cc553ef7f..c69252a7b 100644
--- a/main/devicepkg-utils/APKBUILD
+++ b/main/devicepkg-utils/APKBUILD
@@ -1,5 +1,5 @@
 pkgname=devicepkg-utils
-pkgver=0.3.0
+pkgver=0.3.1
 pkgrel=0
 pkgdesc="Utilities for interacting with device packages"
 url="https://postmarketos.org"
@@ -21,5 +21,5 @@ package() {
 }
 sha512sums="
 ef2181d7072b4ef62c11d3f50677fcd455e50cf89a3110e67fcaa6058ea695f101ded48b1442758494e3d23a97cdd93df6669656f329037020ba715af4341b55  etc-deviceinfo
-b92a28574268c0e71db77309a288d81e2525922cb5043557566e0cfa5fc74986b630762d826eff08462a1506886be3fbfd9cefccd06e006af9b2dc4f89619650  source_deviceinfo
+9e0a27f8f3e236817e3f5d5997bc376dc4d95508ecf5f812c48a29eaf7c9a21d46a2c78a65be98d60a12576b476e27314cdd3515a645b91706a85f929e83c053  source_deviceinfo
 "
diff --git a/main/devicepkg-utils/source_deviceinfo b/main/devicepkg-utils/source_deviceinfo
index 94cd90916..811d51466 100644
--- a/main/devicepkg-utils/source_deviceinfo
+++ b/main/devicepkg-utils/source_deviceinfo
@@ -1,5 +1,6 @@
 # These scripts must be sourced (not executed) to work properly
 # shellcheck disable=SC1091
+SOURCE_DEVICEINFO_ROOT="${SOURCE_DEVICEINFO_ROOT:-}"
 [ -f "$SOURCE_DEVICEINFO_ROOT/usr/share/deviceinfo/deviceinfo" ] && . "$SOURCE_DEVICEINFO_ROOT/usr/share/deviceinfo/deviceinfo"
 [ -f "$SOURCE_DEVICEINFO_ROOT/etc/deviceinfo" ] && . "$SOURCE_DEVICEINFO_ROOT/etc/deviceinfo"