diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index f2f9b459f8..9fd767b8f0 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,7 @@
+2017-06-19  Alan Modra  <amodra@gmail.com>
+
+	* config.bfd: Correct targ_underscore for cris.
+
 2017-06-18  Alan Modra  <amodra@gmail.com>
 
 	* config.bfd: Correct targ_underscore for epiphany, ip2k,
diff --git a/bfd/config.bfd b/bfd/config.bfd
index f8a26f46cb..dc24aabad5 100644
--- a/bfd/config.bfd
+++ b/bfd/config.bfd
@@ -500,15 +500,13 @@ case "${targ}" in
     targ_underscore=yes
     ;;
 
-  cris-*-*)
-    targ_defvec=cris_aout_vec
-    targ_selvecs="cris_elf32_us_vec cris_elf32_vec ieee_vec"
-    targ_underscore=yes
-    ;;
-
-  crisv32-*-*)
+  cris-*-* | crisv32-*-*)
     targ_defvec=cris_aout_vec
     targ_selvecs="cris_elf32_us_vec cris_elf32_vec ieee_vec"
+    case "${targ}" in
+	*-*-linux*) ;;
+	*) targ_underscore=yes ;;
+    esac
     ;;
 
   crx-*-elf*)