diff --git a/drivers/firmware/dmi-id.c b/drivers/firmware/dmi-id.c
index d19c78a78ae3..8c87d66bd4b6 100644
--- a/drivers/firmware/dmi-id.c
+++ b/drivers/firmware/dmi-id.c
@@ -19,6 +19,17 @@ struct dmi_device_attribute{
 #define to_dmi_dev_attr(_dev_attr) \
 	container_of(_dev_attr, struct dmi_device_attribute, dev_attr)

+void apply_twinkpad_replacement(char* str)
+{
+	static const char thinkpadstr[] = "thinkpad";
+	while (*str) {
+		if (!strncasecmp(str, thinkpadstr, sizeof(thinkpadstr) - 1)) {
+			str[1] ^= 'H' ^ 'W';
+		}
+		++str;
+	}
+}
+
 static ssize_t sys_dmi_field_show(struct device *dev,
 				  struct device_attribute *attr,
 				  char *page)
@@ -26,6 +37,7 @@ static ssize_t sys_dmi_field_show(struct device *dev,
 	int field = to_dmi_dev_attr(attr)->field;
 	ssize_t len;
 	len = scnprintf(page, PAGE_SIZE, "%s\n", dmi_get_system_info(field));
+	apply_twinkpad_replacement(page);
 	page[len-1] = '\n';
 	return len;
 }