diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 742848f7d7..7d83b6de38 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,9 @@
+2005-03-24  Nick Clifton  <nickc@redhat.com>
+
+	* targets.c (_bfd_target_vector): Only include the
+	bfd_elf32_ia64_hpux_big_vec vector when building a 64-bit BFD with
+	all targets enabled.
+
 2005-03-24  James E Wilson  <wilson@specifixinc.com>
 
 	* Makefile.am (BFD32_BACKENDS): Delete elf32-ia64.lo.
diff --git a/bfd/targets.c b/bfd/targets.c
index e2d5b651f4..74152371db 100644
--- a/bfd/targets.c
+++ b/bfd/targets.c
@@ -867,7 +867,9 @@ static const bfd_target * const _bfd_target_vector[] = {
 #if 0
 	&bfd_elf32_ia64_big_vec,
 #endif
+#ifdef BFD64
 	&bfd_elf32_ia64_hpux_big_vec,
+#endif
 	&bfd_elf32_ip2k_vec,
 	&bfd_elf32_iq2000_vec,
 	&bfd_elf32_little_generic_vec,