--- util-linux-2.12q/MCONFIG
+++ util-linux-2.12q/MCONFIG
@@ -17,7 +17,7 @@
 # Select for CPU i386 if the binaries must be able to run on an intel 386
 # (by default i486 code is generated, see below)
 CPU=$(shell uname -m)
-ARCH=$(shell echo $(CPU) | sed 's/i.86/intel/;s/arm.*/arm/')
+ARCH=$(shell echo $(CPU) | sed 's/i.86/intel/;s/arm.*/arm/;s/x86_64/intel/')
 
 # If HAVE_PAM is set to "yes", then login, chfn, chsh, and newgrp
 # will use PAM for authentication. Additionally, passwd will not be
@@ -137,6 +137,10 @@
   else
     CPUTAIL=486
   endif
+  ifeq "$(CPU)" "x86_64"
+    CPUHEAD=-mcpu=
+    CPUTAIL=nocona
+  endif
   CPUOPT= $(CPUHEAD)$(CPUTAIL)
   OPT=          -pipe -O2 $(CPUOPT) -fomit-frame-pointer
 else