diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 4dc878ed41..034d34d2f3 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,7 @@
+2015-05-01  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* config.bfd: Support i[3-7]86-*-elf*.
+
 2015-04-30  H.J. Lu  <hongjiu.lu@intel.com>
 
 	* elf32-i386.c (elf_backend_post_process_headers): Undef for
diff --git a/bfd/config.bfd b/bfd/config.bfd
index 2fdec8b5b0..aad87d2eba 100644
--- a/bfd/config.bfd
+++ b/bfd/config.bfd
@@ -528,7 +528,7 @@ case "${targ}" in
     targ_selvecs=i386_elf32_vec
     ;;
   i[3-7]86-*-sysv4* | i[3-7]86-*-unixware* | \
-  i[3-7]86-*-elf | i[3-7]86-*-sco3.2v5* | \
+  i[3-7]86-*-elf* | i[3-7]86-*-sco3.2v5* | \
   i[3-7]86-*-dgux* | i[3-7]86-*-sysv5*)
     targ_defvec=i386_elf32_vec
     targ_selvecs=i386_coff_vec
diff --git a/gas/ChangeLog b/gas/ChangeLog
index 1aa506d9fa..e494ab1f8d 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,7 @@
+2015-05-01  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* configure.tgt: Support i386-*-elf*.
+
 2015-04-30  DJ Delorie  <dj@redhat.com>
 
 	* config/rl78-defs.h (rl78_isa_g10): New.
diff --git a/gas/configure.tgt b/gas/configure.tgt
index 79699704ce..09ee275832 100644
--- a/gas/configure.tgt
+++ b/gas/configure.tgt
@@ -215,7 +215,7 @@ case ${generic_target} in
   i386-*-beospe*)			fmt=coff em=pe ;;
   i386-*-beos*)				fmt=elf ;;
   i386-*-coff)				fmt=coff ;;
-  i386-*-elf)				fmt=elf ;;
+  i386-*-elf*)				fmt=elf ;;
   i386-*-kaos*)				fmt=elf ;;
   i386-*-bsd*)				fmt=aout em=386bsd ;;
   i386-*-nacl*)				fmt=elf em=nacl