diff --git a/device/device-qemu-aarch64/APKBUILD b/device/device-qemu-aarch64/APKBUILD
index 2fea9629d..4ea17e665 100644
--- a/device/device-qemu-aarch64/APKBUILD
+++ b/device/device-qemu-aarch64/APKBUILD
@@ -24,5 +24,5 @@ weston() {
 }
 
 
-sha512sums="efeac6718626d61f12a7db13ee64f756e8957acc828d7ee9aa994f7fe90c81b9a929f16295dbc3f6987583cd3c947b30f5c08a52f2f376dad9e582748b2cd5c9  deviceinfo
+sha512sums="ccf2b5b2867a206af6188eb3d08a840782dda9c0fb88b9052c29a44121a64a3404664c054f056a0d69918f83997f1c94e42c094cf351fe75648f0f4c48a1359e  deviceinfo
 de794566118f1744d068a94e6a75b61d43f6749a4b0871a5270fa7a2048164d609c71fcffa61845c2a7dd4cb5fbeb72c0e4f8b73b382f36d6ff0bcc9b8a5ae25  weston.ini"
diff --git a/device/device-qemu-aarch64/deviceinfo b/device/device-qemu-aarch64/deviceinfo
index e39e472ac..60fb2c702 100644
--- a/device/device-qemu-aarch64/deviceinfo
+++ b/device/device-qemu-aarch64/deviceinfo
@@ -2,8 +2,8 @@
 # Please use double quotes only. You can source this file in shell scripts.
 
 deviceinfo_format_version="0"
-deviceinfo_name="Qemu aarch64 virt"
-deviceinfo_manufacturer="Qemu"
+deviceinfo_name="QEMU aarch64"
+deviceinfo_manufacturer="QEMU"
 deviceinfo_codename="qemu-aarch64"
 deviceinfo_date=""
 deviceinfo_keyboard="true"
diff --git a/device/device-qemu-amd64/APKBUILD b/device/device-qemu-amd64/APKBUILD
index e06f0c865..28fd8b3d0 100644
--- a/device/device-qemu-amd64/APKBUILD
+++ b/device/device-qemu-amd64/APKBUILD
@@ -47,5 +47,5 @@ kernel_mainline() {
 	mkdir "$subpkgdir"
 }
 
-sha512sums="12a8f36ae33ccc630b70249ec7d8c637f83b874228f8d6d8678d439ffa589e5d2c57b1f29398ee0bf67cc8f9c51f86715a83ca5ece3ba3cfce19886b1254f6ad  deviceinfo
+sha512sums="c3cc32569e72ffb7babcd42e496bb1ee78e0042fcf1ac3daf5d632632808369c774e4d4bf2f49ac82dcc800ca8a2c3f2139ea8d7213010332ba1d71eef661a4f  deviceinfo
 47b27c7572b8737988488f7eb23b9e68f9a944e22baafe1c78355d2514a2554cf41d99b29fca12238eb13a6f5d53f00ca89b94e534e8461ebab72256dcf0f142  weston.ini"
diff --git a/device/device-qemu-amd64/deviceinfo b/device/device-qemu-amd64/deviceinfo
index e365619b0..0e92a9ce1 100644
--- a/device/device-qemu-amd64/deviceinfo
+++ b/device/device-qemu-amd64/deviceinfo
@@ -2,8 +2,8 @@
 # Please use double quotes only. You can source this file in shell scripts.
 
 deviceinfo_format_version="0"
-deviceinfo_name="Qemu amd64"
-deviceinfo_manufacturer="Qemu"
+deviceinfo_name="QEMU amd64"
+deviceinfo_manufacturer="QEMU"
 deviceinfo_codename="qemu-amd64"
 deviceinfo_date=""
 deviceinfo_keyboard="true"
diff --git a/device/device-qemu-vexpress/APKBUILD b/device/device-qemu-vexpress/APKBUILD
index 5f574313b..bd1931d21 100644
--- a/device/device-qemu-vexpress/APKBUILD
+++ b/device/device-qemu-vexpress/APKBUILD
@@ -17,4 +17,4 @@ package() {
 		"$pkgdir"/etc/deviceinfo
 }
 
-sha512sums="57a8e79fc16dfd788a2c872b5016e406793c92362118de2f97f9f6d0cb231abf10af88a0c641da55e1c77150d38e6a2896863a8e0e11cba5b24e7ba0e98e7638  deviceinfo"
+sha512sums="4ad09997f7f5f5354453d2a5b60f4841cab245f710907591c4b066e883b8fc903c9f01096bb7cecbec32e6856942a8434a85decc1ba4a5cd65f341d8b0ba7091  deviceinfo"
diff --git a/device/device-qemu-vexpress/deviceinfo b/device/device-qemu-vexpress/deviceinfo
index d88c03ec8..7e0f1e9ec 100644
--- a/device/device-qemu-vexpress/deviceinfo
+++ b/device/device-qemu-vexpress/deviceinfo
@@ -2,8 +2,8 @@
 # Please use double quotes only. You can source this file in shell scripts.
 
 deviceinfo_format_version="0"
-deviceinfo_name="Qemu armhf vexpress"
-deviceinfo_manufacturer="Qemu"
+deviceinfo_name="QEMU arm"
+deviceinfo_manufacturer="QEMU"
 deviceinfo_codename="qemu-vexpress"
 deviceinfo_date=""
 deviceinfo_keyboard="true"
diff --git a/main/abuild-aarch64-qemu-workaround/APKBUILD b/main/abuild-aarch64-qemu-workaround/APKBUILD
index 91817d574..92de66c19 100644
--- a/main/abuild-aarch64-qemu-workaround/APKBUILD
+++ b/main/abuild-aarch64-qemu-workaround/APKBUILD
@@ -1,7 +1,7 @@
 pkgname=abuild-aarch64-qemu-workaround
 pkgver=3.1.0
 pkgrel=1
-pkgdesc="Patched abuild-tar that works with Qemu"
+pkgdesc="Patched abuild-tar that works with QEMU"
 url="https://gitlab.com/postmarketOS/pmbootstrap/issues/546"
 arch="aarch64"
 license="GPL2"
@@ -22,4 +22,4 @@ package() {
 }
 
 sha512sums="fcdbef96b06a908148d6df41981fca19fe1767274b283efbb3f1adaefc074a4daa7b8eea8d49c533858c464e45b3954f97cd3d0185f0ed7e464244f9802001f5  abuild-3.1.0.tar.gz
-a80c55fe6cb6cc410ca409558c1e1ab8edec9a675031c404cec84c19b4b8460fbbba92db5c1401c0027f8fc0f5be4b82177ec2fad9d734cbc50ca24bfe6e149f  write-check-count.patch"
+f87443b9365da3a65d378ba86b0209d7efad4bd74666b9d9afbc2c2da1becc61f057943b8d5eddf730b658fd67f75040a57fc804f692e0f33fcb9eb4e57f47f3  write-check-count.patch"
diff --git a/main/abuild-aarch64-qemu-workaround/write-check-count.patch b/main/abuild-aarch64-qemu-workaround/write-check-count.patch
index 39ad73180..b3500d9af 100644
--- a/main/abuild-aarch64-qemu-workaround/write-check-count.patch
+++ b/main/abuild-aarch64-qemu-workaround/write-check-count.patch
@@ -5,7 +5,7 @@
  	} while (1);
  
 -	if (total == 0 && n < 0)
-+	// Workaround for Qemu bug: also check for count:
++	// Workaround for QEMU bug: also check for count:
 +	// <https://github.com/postmarketOS/pmbootstrap/issues/546>
 +	if (total == 0 && n < 0 && count)
  		return -errno;