diff -urN RC13-git3-jd5/arch/um/kernel/user_util.c RC13-git3-jd6/arch/um/kernel/user_util.c
--- RC13-git3-jd5/arch/um/kernel/user_util.c	2005-06-17 15:48:29.000000000 -0400
+++ RC13-git3-jd6/arch/um/kernel/user_util.c	2005-09-04 08:52:32.000000000 -0400
@@ -132,7 +132,12 @@
 	struct utsname host;
 
 	uname(&host);
-	strcpy(machine_out, host.machine);
+	/* XXX: crude detection of 32-bit binary. */
+	if (sizeof(long) == 4 && !strcmp(host.machine, "x86_64")) {
+		strcpy(machine_out, "i686");
+	} else {
+		strcpy(machine_out, host.machine);
+	}
 }
 
 char host_info[(_UTSNAME_LENGTH + 1) * 4 + _UTSNAME_NODENAME_LENGTH + 1];