diff --git a/ChangeLog b/ChangeLog
index e21504b9e..e8243693f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-07-17  Pavel Roskin  <proski@gnu.org>
+
+	* configure.ac: Default to pc platform for x86_64.
+
 2008-07-17  Robert Millan  <rmh@aybabtu.com>
 
 	Partial LinuxBIOS -> Coreboot rename.
diff --git a/configure b/configure
index 0338d0d1e..dfa2b1d16 100644
--- a/configure
+++ b/configure
@@ -1945,6 +1945,7 @@ if test "x$with_platform" = x; then
   case "$target_cpu"-"$target_vendor" in
     i386-apple) platform=efi ;;
     i386-*) platform=pc ;;
+    x86_64-*) platform=pc ;;
     powerpc-*) platform=ieee1275 ;;
     sparc64-*) platform=ieee1275 ;;
     *) { { echo "$as_me:$LINENO: error: unsupported machine type" >&5
diff --git a/configure.ac b/configure.ac
index 031974d87..7d1782bbb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -61,6 +61,7 @@ if test "x$with_platform" = x; then
   case "$target_cpu"-"$target_vendor" in
     i386-apple) platform=efi ;;
     i386-*) platform=pc ;;
+    x86_64-*) platform=pc ;;
     powerpc-*) platform=ieee1275 ;;
     sparc64-*) platform=ieee1275 ;;
     *) AC_MSG_ERROR([unsupported machine type]) ;;