diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index c9a78ceb72..4462553c2a 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,9 @@
+2017-09-02  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* configure.ac (bfd_backends): Add elf64-x86-64.lo together
+	with elfxx-x86.lo for 64-bit BFD.
+	* configure: Regenerated.
+
 2017-09-02  H.J. Lu  <hongjiu.lu@intel.com>
 
 	* elfxx-x86.h (elf_x86_link_hash_table): Rearrange fields and
diff --git a/bfd/configure b/bfd/configure
index dce88a1120..f555c62ae0 100755
--- a/bfd/configure
+++ b/bfd/configure
@@ -14758,10 +14758,10 @@ rm -f conftest*
     ;;
 esac
 
-# elfxx-x86.lo needs elf64.lo with 64-bit BFD.
+# elfxx-x86.lo needs elf64-x86-64.lo and elf64.lo with 64-bit BFD.
 case "${bfd_backends}-${wordsize}" in
   *elfxx-x86.lo*-64*)
-    bfd_backends="${bfd_backends} elf64.lo"
+    bfd_backends="${bfd_backends} elf64-x86-64.lo elf64.lo"
     ;;
 esac
 
diff --git a/bfd/configure.ac b/bfd/configure.ac
index 3f2cedfd63..1930a41406 100644
--- a/bfd/configure.ac
+++ b/bfd/configure.ac
@@ -825,10 +825,10 @@ case ${host64}-${target64}-${want64} in
     ;;
 esac
 
-# elfxx-x86.lo needs elf64.lo with 64-bit BFD.
+# elfxx-x86.lo needs elf64-x86-64.lo and elf64.lo with 64-bit BFD.
 case "${bfd_backends}-${wordsize}" in
   *elfxx-x86.lo*-64*)
-    bfd_backends="${bfd_backends} elf64.lo"
+    bfd_backends="${bfd_backends} elf64-x86-64.lo elf64.lo"
     ;;
 esac