diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 14341c480f..b12fca1d12 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,10 @@
+2010-06-10  Tristan Gingold  <gingold@adacore.com>
+
+	* config.bfd: Remove #if/#endif so that som can be compiled on any
+	host.
+	* targets.c (_bfd_target_vector): Remove #if/#endif so that som
+	can be used on any host.
+
 2010-06-10  Tristan Gingold  <gingold@adacore.com>
 
 	* som.c: Can now be compiled on any host.
diff --git a/bfd/config.bfd b/bfd/config.bfd
index abe1b5eb44..b25b2fa79c 100644
--- a/bfd/config.bfd
+++ b/bfd/config.bfd
@@ -470,7 +470,6 @@ case "${targ}" in
     targ_selvecs=bfd_elf32_hppa_linux_vec
     ;;
 
-#if defined (HOST_HPPAHPUX) || defined (HOST_HPPABSD) || defined (HOST_HPPAOSF) || defined (HOST_HPPAMPEIX)
   hppa*-*-bsd*)
     targ_defvec=som_vec
     targ_selvecs=bfd_elf32_hppa_vec
@@ -482,7 +481,6 @@ case "${targ}" in
     targ_defvec=som_vec
     targ_selvecs=bfd_elf32_hppa_vec
     ;;
-#endif /* defined (HOST_HPPAHPUX) || defined (HOST_HPPABSD) || defined (HOST_HPPAOSF) */
 
   i370-*-*)
     targ_defvec=bfd_elf32_i370_vec
diff --git a/bfd/targets.c b/bfd/targets.c
index 61a8f2deaf..8e0fafefbb 100644
--- a/bfd/targets.c
+++ b/bfd/targets.c
@@ -1204,9 +1204,7 @@ static const bfd_target * const _bfd_target_vector[] =
 	&shlcoff_vec,
 	&shlpe_vec,
 	&shlpei_vec,
-#if defined (HOST_HPPAHPUX) || defined (HOST_HPPABSD) || defined (HOST_HPPAOSF)
 	&som_vec,
-#endif
 	&sparccoff_vec,
 	&sparcle_aout_vec,
 	&sparclinux_vec,