diff --git a/target/linux/x86/base-files/lib/preinit/01_sysinfo b/target/linux/x86/base-files/lib/preinit/01_sysinfo
index cc0ac284b..97e8e003f 100644
--- a/target/linux/x86/base-files/lib/preinit/01_sysinfo
+++ b/target/linux/x86/base-files/lib/preinit/01_sysinfo
@@ -13,10 +13,9 @@ do_sysinfo_x86() {
 	for file in sys_vendor board_vendor; do
 		vendor="$(cat /sys/devices/virtual/dmi/id/$file 2>/dev/null)"
 		case "$vendor" in
-		"System manufacturer")
-			continue
-			;;
-		"To be filled by O.E.M."|"To Be Filled By O.E.M.")
+		empty | \
+		System\ manufacturer | \
+		To\ [bB]e\ [fF]illed\ [bB]y\ O\.E\.M\.)
 			continue
 			;;
 		esac
@@ -26,14 +25,21 @@ do_sysinfo_x86() {
 	for file in product_name board_name; do
 		product="$(cat /sys/devices/virtual/dmi/id/$file 2>/dev/null)"
 		case "$vendor:$product" in
+		?*:empty | \
+		?*:System\ Product\ Name | \
+		?*:To\ [bB]e\ [fF]illed\ [bB]y\ O\.E\.M\.)
+			continue
+			;;
 		"PC Engines:APU")
 			product="apu1"
 			break
 			;;
 		"Sophos:SG"|"Sophos:XG")
-			case "$(cat /sys/devices/virtual/dmi/id/product_version 2>/dev/null)" in
-			105*)
-				product="${product}-105"
+			local product_version
+			product_version="$(cat /sys/devices/virtual/dmi/id/product_version 2>/dev/null)"
+			case "$product_version" in
+			105*|115*|125*|135*)
+				product="${product}-${product_version}"
 				break
 				;;
 			esac
@@ -41,12 +47,6 @@ do_sysinfo_x86() {
 		"Supermicro:Super Server")
 			continue
 			;;
-		?*:System\ Product\ Name)
-			continue
-			;;
-		?*:To\ be\ filled\ by\ O\.E\.M\.|?*:To\ Be\ Filled\ By\ O\.E\.M\.)
-			continue
-			;;
 		?*:?*)
 			break
 			;;