diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index edff887d20..67fd18a102 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,7 @@
+2017-06-14  Sebastian Huber  <sebastian.huber@embedded-brains.de>
+
+	* config.bfd (epiphany-*-elf): Accept epiphany-*-*.
+
 2017-06-13  H.J. Lu  <hongjiu.lu@intel.com>
 
 	PR ld/20022
diff --git a/bfd/config.bfd b/bfd/config.bfd
index eb6a958ec5..d0b509dc80 100644
--- a/bfd/config.bfd
+++ b/bfd/config.bfd
@@ -524,7 +524,7 @@ case "${targ}" in
     targ_defvec=d30v_elf32_vec
     ;;
 
-  epiphany-*-elf)
+  epiphany-*-*)
     targ_defvec=epiphany_elf32_vec
     ;;
 
diff --git a/ld/ChangeLog b/ld/ChangeLog
index 7995de833d..4924787e80 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,7 @@
+2017-06-14  Sebastian Huber  <sebastian.huber@embedded-brains.de>
+
+	* configure.tgt (epiphany-*-elf): Accept epiphany-*-*.
+
 2017-06-13  H.J. Lu  <hongjiu.lu@intel.com>
 
 	* ldlang.c (lang_set_startof): Skip if config.build_constructors
diff --git a/ld/configure.tgt b/ld/configure.tgt
index 1b981d4f9b..47c719cd05 100644
--- a/ld/configure.tgt
+++ b/ld/configure.tgt
@@ -206,7 +206,7 @@ d30v-*-*)		targ_emul=d30velf; targ_extra_emuls="d30v_e d30v_o"
 			;;
 dlx-*-elf*)		targ_emul=elf32_dlx
 			;;
-epiphany-*-elf)		targ_emul=elf32epiphany
+epiphany-*-*)		targ_emul=elf32epiphany
 			targ_extra_emuls="elf32epiphany_4x4"
 			;;
 fido*-*-elf*)		targ_emul=m68kelf ;;