--- /usr/bin/emerge	2008-10-10 23:05:44.000000000 +0200
+++ emerge	2008-12-28 19:57:48.000000000 +0100
@@ -6720,6 +6720,13 @@
 		for line in wrap(msg, 72):
 			writemsg("%s%s\n" % (prefix, line), noiselevel=-1)
 
+	host = commands.getstatusoutput("uname -m")[1]
+	arch = settings["ARCH"]
+	if host == "x86_64" and arch == "x86":
+		print colorize("BAD", "\n!!! WARNING: 32-bit CHOST does not match 64-bit uname -m")
+		print colorize("BAD", "To correctly chroot into a 32-bit environment, use the command \"linux32 chroot\".")
+		print colorize("BAD", "See http://www.gentoo.org/proj/en/base/amd64/howtos/chroot.xml for more information.")
+
 	if "moo" in myfiles:
 		print """