diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 56b40c5ffa..00f63f2370 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+2012-10-30  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* configure.in: Also handle --enable-64-bit-bfd when setting
+	CORE_HEADER for 'i[3-7]86-*-linux-*'.
+
 2012-10-30  Steve McIntyre  <steve.mcintyre@linaro.org>
 
 	* elf32-arm.c (elf32_arm_print_private_bfd_data): Recognise and
diff --git a/bfd/configure b/bfd/configure
index 427e5c10cd..43bff03f00 100755
--- a/bfd/configure
+++ b/bfd/configure
@@ -13927,8 +13927,8 @@ if test "${target}" = "${host}"; then
   i[3-7]86-*-linux-*)
 	COREFILE=trad-core.lo
 	TRAD_HEADER='"hosts/i386linux.h"'
-	case "$enable_targets" in
-	*x86_64-*linux*)
+	case "$enable_targets"-"$want64" in
+	*x86_64-*linux*|*-true)
 	  CORE_HEADER='"hosts/x86-64linux.h"'
 	esac
 	;;
diff --git a/bfd/configure.in b/bfd/configure.in
index 9a31c04acf..6261aab959 100644
--- a/bfd/configure.in
+++ b/bfd/configure.in
@@ -331,8 +331,8 @@ changequote(,)dnl
 changequote([,])dnl
 	COREFILE=trad-core.lo
 	TRAD_HEADER='"hosts/i386linux.h"'
-	case "$enable_targets" in
-	*x86_64-*linux*)
+	case "$enable_targets"-"$want64" in
+	*x86_64-*linux*|*-true)
 	  CORE_HEADER='"hosts/x86-64linux.h"'
 	esac
 	;;