diff -Naur gnustep-make-1.13.0.dist/config.sub gnustep-make-1.13.0/config.sub
--- config.sub	Wed Feb 22 07:43:07 2006
+++ config.sub.dist	Tue Mar 20 22:52:37 2007
@@ -395,10 +395,10 @@
 		os=-bsd
 		;;
 	amd64)
-		basic_machine=x86_64-pc
+		basic_machine=amd64
 		;;
 	amd64-*)
-		basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
+		basic_machine=amd64-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	amdahl)
 		basic_machine=580-amdahl