diff -urN sorcery.ori/var/lib/sorcery/archspecs/amd64/x86_64 sorcery/var/lib/sorcery/archspecs/amd64/x86_64
--- sorcery.ori/var/lib/sorcery/archspecs/amd64/x86_64	2004-07-16 01:05:21.000000000 +0200
+++ sorcery/var/lib/sorcery/archspecs/amd64/x86_64	2004-09-16 16:29:20.768701769 +0200
@@ -1,5 +1,11 @@
 CPUNAME="AMD Athlon 64, Athlon 64 FX and Opteron"
-CFLAGS="-march=athlon-xp -mmmx -mfpmath=sse -msse -msse2 -m3dnow -m64"
-HOST="i686-pc-linux-gnu"
-FAST="-O3"
+# -m64 is not needed since it is the default. However, since gcc spell
+# adds  a -m32, this was causing problems.
+CFLAGS="-march=k8 -mmmx -mfpmath=sse -msse -msse2 -m3dnow"
+HOST="x86_64-unknown-linux-gnu"
+FAST="-O2"
 SMALL="-Os"
+BI_ARCH="yes"
+LIB="lib64"
+SUBARCH="x86_32"
+SUBLIB="lib"