diff --git a/[refs] b/[refs]
index d97a2d47eb4a..78abf3f505da 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 36decba90b184a25b7f77fb7df1612125cc41ac5
+refs/heads/master: 8e5cb35a60c8792ffc3ba89ea66ebdd3c2f01cb1
diff --git a/trunk/arch/um/kernel/user_util.c b/trunk/arch/um/kernel/user_util.c
index a25f3ea11fd7..41d17c71511c 100644
--- a/trunk/arch/um/kernel/user_util.c
+++ b/trunk/arch/um/kernel/user_util.c
@@ -128,6 +128,12 @@ void setup_machinename(char *machine_out)
 	struct utsname host;
 
 	uname(&host);
+#if defined(UML_CONFIG_UML_X86) && !defined(UML_CONFIG_64BIT)
+	if (!strcmp(host.machine, "x86_64")) {
+		strcpy(machine_out, "i686");
+		return;
+	}
+#endif
 	strcpy(machine_out, host.machine);
 }