diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 5dc2ea66951..810dd0585df 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+2016-11-04  Nick Clifton  <nickc@redhat.com>
+
+	* targets.c (bfd_target_vector): Only add riscv_elf32_vec target
+	when supporting 64-bit BFD targets.
+
 2016-11-03  Tristan Gingold  <gingold@adacore.com>
 
 	* config.bfd: Deprecate many old triplets.
diff --git a/bfd/targets.c b/bfd/targets.c
index bc61c0228fc..8e6158e6673 100644
--- a/bfd/targets.c
+++ b/bfd/targets.c
@@ -1305,8 +1305,8 @@ static const bfd_target * const _bfd_target_vector[] =
 	&powerpc_xcoff_vec,
 #endif
 
-	&riscv_elf32_vec,
 #ifdef BFD64
+	&riscv_elf32_vec,
 	&riscv_elf64_vec,
 #endif
 	&rl78_elf32_vec,