diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 5b661b9a9e5..c1d83f20573 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,9 @@
+2017-08-30  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* configure.ac (bfd_backends): Add elf64.lo together with
+	elfxx-x86.lo for 64-bit BFD.
+	* configure: Regenerated.
+
 2017-08-31  James Bowman  <james.bowman@ftdichip.com>
 
 	* elf32-ft32.c (ft32_elf_howto_table): Use complain_overflow_dont
diff --git a/bfd/configure b/bfd/configure
index 32ee062e808..dce88a11200 100755
--- a/bfd/configure
+++ b/bfd/configure
@@ -14758,6 +14758,13 @@ rm -f conftest*
     ;;
 esac
 
+# elfxx-x86.lo needs elf64.lo with 64-bit BFD.
+case "${bfd_backends}-${wordsize}" in
+  *elfxx-x86.lo*-64*)
+    bfd_backends="${bfd_backends} elf64.lo"
+    ;;
+esac
+
 tdefaults=""
 test -n "${defvec}" && tdefaults="${tdefaults} -DDEFAULT_VECTOR=${defvec}"
 test -n "${selvecs}" && tdefaults="${tdefaults} -DSELECT_VECS='${selvecs}'"
diff --git a/bfd/configure.ac b/bfd/configure.ac
index 0e4c669b7d2..3f2cedfd635 100644
--- a/bfd/configure.ac
+++ b/bfd/configure.ac
@@ -825,6 +825,13 @@ case ${host64}-${target64}-${want64} in
     ;;
 esac
 
+# elfxx-x86.lo needs elf64.lo with 64-bit BFD.
+case "${bfd_backends}-${wordsize}" in
+  *elfxx-x86.lo*-64*)
+    bfd_backends="${bfd_backends} elf64.lo"
+    ;;
+esac
+
 tdefaults=""
 test -n "${defvec}" && tdefaults="${tdefaults} -DDEFAULT_VECTOR=${defvec}"
 test -n "${selvecs}" && tdefaults="${tdefaults} -DSELECT_VECS='${selvecs}'"