--- configure.ac.orig	2014-04-30 21:49:45.000000000 +0200
+++ configure.ac	2014-06-10 17:17:05.970166776 +0200
@@ -4024,7 +4024,7 @@
         PLATFORMID=freebsd_x86
         OUTPATH=unxfbsdi
         ;;
-    x86_64)
+    x86_64|amd64)
         CPUNAME=X86_64
         RTL_ARCH=X86_64
         PLATFORMID=freebsd_x86_64
@@ -7051,7 +7051,7 @@
             JAVA_ARCH="i386"
             JAVA_TOOLKIT="client"
             ;;
-        x86_64)
+        x86_64|amd64)
             if test "`echo $JAVA_HOME | sed -e 's,.*/,,'`" = "linux"; then
                 JAVA_ARCH="i386"
                 JAVA_TOOLKIT="client"