diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 0b4c5e6d0d5..140823fdffd 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,7 @@
+2009-09-30  Tristan Gingold  <gingold@adacore.com>
+
+	* configure.com: Use hosts/alphavms.h on both alpha and ia64 VMS.
+
 2009-09-29  H.J. Lu  <hongjiu.lu@intel.com>
 
 	* elf64-x86-64.c (elf64_x86_64_append_rela): New.
diff --git a/bfd/configure.com b/bfd/configure.com
index 04113aaa05b..21024156eba 100644
--- a/bfd/configure.com
+++ b/bfd/configure.com
@@ -318,6 +318,9 @@ $ create []config.h
 /* Disable NLS  */
 #undef ENABLE_NLS
 $!
+$ write sys$output "Copy sysdep.h"
+$ copy [.hosts]alphavms.h sysdep.h
+$
 $ write sys$output "Generate build.com"
 $!
 $ if ARCH.eqs."alpha"
@@ -362,7 +365,6 @@ $ write sys$output "Generate elf64-target.h from elfxx-target.h"
 $ edit/tpu/nojournal/nosection/nodisplay/command=substxx.tpu -
         []elfXX-target.h /output=[]elf64-target.h
 $ del substxx.tpu;*
-$ copy [.hosts]alphavms.h sysdep.h
 $ endif
 $ append sys$input build.com
 $DECK