diff --git a/main/devicepkg-dev/APKBUILD b/main/devicepkg-dev/APKBUILD
index 0194ef6d1..079c0e524 100644
--- a/main/devicepkg-dev/APKBUILD
+++ b/main/devicepkg-dev/APKBUILD
@@ -1,6 +1,6 @@
 maintainer=""
 pkgname=devicepkg-dev
-pkgver=0.19.0
+pkgver=0.20.0
 pkgrel=0
 pkgdesc="Provides default device package functions"
 url="https://postmarketos.org"
@@ -74,7 +74,7 @@ package() {
 }
 sha512sums="
 d69930dd790b00fb39760a37d95a10899f0d167e10e2804feb05d9ce04f94185dc32d36edc90214aba2ea2aa09bf18f7dab93f1d2eff23f67beb2cc83be30e7c  compiler-gcc.h
-a483a970f6cf3e1f2724d8ec1039c2a935cc3e75efd016b3f134cef8a6e53820428bff0f1cb2bcfbd8ccda33c69fdb250be1cf061b2dc53c6063d2ab49023f97  devicepkg_build.sh
+1ed82c638bda2c2edff4f2f314b466a3ce0e8a2a33b05e5f31ddc2b06fc06d2d8ea4dca7cc354262ac28402c90ea36d77b0347fafeccee8894c9ff013911a7d1  devicepkg_build.sh
 c6732b02727bddecf051132734ade8ae2d4f082db32f714d0d29b0935e079a39b9f02e33d27e85f792599b3ea81081a173c3d36cd83ff53a77e1aa4fd2725478  devicepkg_package.sh
 f81e74e45ae8e55686ae459f550e229e7398daeafa72bd023c2d8c3a0d50e60bf53d5bbdfec931e9fbabe1cd71de57b2192805aaef091ab90bc7203cbaf66ba6  downstreamkernel_prepare.sh
 107242a3da38a574c46cb779e0c75afbeef4cfe659e1b85971973ac55843df06f70f53a5985ca623d4123f05f2984f5dace4a53a3509ecefd7dfdc3c8b705cfe  downstreamkernel_package.sh
diff --git a/main/devicepkg-dev/devicepkg_build.sh b/main/devicepkg-dev/devicepkg_build.sh
index e041896f7..d9f2b2031 100644
--- a/main/devicepkg-dev/devicepkg_build.sh
+++ b/main/devicepkg-dev/devicepkg_build.sh
@@ -71,7 +71,10 @@ generate_machine_info()
 	{
 		local model="${deviceinfo_name#"${deviceinfo_manufacturer}" *}"
 		echo "PRETTY_HOSTNAME=\"$deviceinfo_name\""
-		echo "CHASSIS=\"$deviceinfo_chassis\""
+		# deviceinfo_chassis is not mandatory, don't assume it to be set.
+		if [ -n "${deviceinfo_chassis+set}" ]; then
+			echo "CHASSIS=\"$deviceinfo_chassis\""
+		fi
 		echo "HARDWARE_VENDOR=\"$deviceinfo_manufacturer\""
 		echo "HARDWARE_MODEL=\"$model\""
 	} > "$srcdir/machine-info"