diff --git a/main/devicepkg-dev/APKBUILD b/main/devicepkg-dev/APKBUILD
index cfef7c221..e05910cb0 100644
--- a/main/devicepkg-dev/APKBUILD
+++ b/main/devicepkg-dev/APKBUILD
@@ -1,5 +1,5 @@
 pkgname=devicepkg-dev
-pkgver=0.17.1
+pkgver=0.18.0
 pkgrel=0
 pkgdesc="Provides default device package functions"
 url="https://postmarketos.org"
@@ -76,7 +76,7 @@ package() {
 }
 sha512sums="
 d69930dd790b00fb39760a37d95a10899f0d167e10e2804feb05d9ce04f94185dc32d36edc90214aba2ea2aa09bf18f7dab93f1d2eff23f67beb2cc83be30e7c  compiler-gcc.h
-54b369ff87e017114edae03986dec79742280c55a156a98ea8c6a1c740632e904e51c01810e7dac99add0d9d06c0fcebb040fed595348f180233b3ec810443ba  devicepkg_build.sh
+faba89519197a9bccba3049a031f11b22f5c8b1b87b5278cb4daaa9d73f5946394643f9a59f76eb120618e6fe8df08b80879eca12b76a24ce03b1c9c7db65528  devicepkg_build.sh
 5b83255dabd2019ea07a589d185bee5dad6760e28ab02de3480a0adfd1cf20d0c2e0b4a978e56757899ef683819091cee99d168a48e24a3f604b725e1ba26849  devicepkg_package.sh
 3b997a00e76be7d4540290275585026c5b83832c0b9a7214346763f03ec196b3f1bea9f50a9928a5cab0bc22dc557af136ffe146bd45d3666b5c05589891047d  devicepkg_pmtest_post_install.sh
 f81e74e45ae8e55686ae459f550e229e7398daeafa72bd023c2d8c3a0d50e60bf53d5bbdfec931e9fbabe1cd71de57b2192805aaef091ab90bc7203cbaf66ba6  downstreamkernel_prepare.sh
diff --git a/main/devicepkg-dev/devicepkg_build.sh b/main/devicepkg-dev/devicepkg_build.sh
index 437ae234e..100f1b983 100644
--- a/main/devicepkg-dev/devicepkg_build.sh
+++ b/main/devicepkg-dev/devicepkg_build.sh
@@ -69,10 +69,11 @@ generate_machine_info()
 {
 	# shellcheck disable=SC2154
 	{
+		local model="${deviceinfo_name#"${deviceinfo_manufacturer}" *}"
 		echo "PRETTY_HOSTNAME=\"$deviceinfo_name\""
 		echo "CHASSIS=\"$deviceinfo_chassis\""
 		echo "HARDWARE_VENDOR=\"$deviceinfo_manufacturer\""
-		echo "HARDWARE_MODEL=\"$deviceinfo_name\""
+		echo "HARDWARE_MODEL=\"$model\""
 	} > "$srcdir/machine-info"
 }