diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 8e71612da88f02839b5d9be29d2b2149c032065b..d16404e217515ef4e6c6d876bc31f2530030f765 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,10 @@
 2002-01-25  Douglas B Rupp  <rupp@gnat.com>
 
+	* config/alpha/x-vms (version): Make static.
+
+	* config/alpha/vms.h (MD_FALLBACK_FRAME_STATE_FOR): Fix error
+	in previous checkin.
+
 	* Makefile.in (install-headers-cp): New target.
 	* config.gcc (alpha-dec-*vms*): Install headers with
 	install-headers-cp
diff --git a/gcc/config/alpha/vms.h b/gcc/config/alpha/vms.h
index 2d1d7d6431443fac5101f10a24a9ac6c1515a8df..a01556ecc322cc9b05dad6c8c68ecb4cea75010c 100644
--- a/gcc/config/alpha/vms.h
+++ b/gcc/config/alpha/vms.h
@@ -413,14 +413,14 @@ do {									\
       (FS)->regs.reg[27].loc.offset = -pv->pdsc$l_size;			\
       (FS)->regs.reg[27].how = REG_SAVED_OFFSET;			\
       (FS)->regs.reg[26].loc.offset					\
-	 = pv->pdsc$w_rsa_offset - pv->pdsc$l_size;			\
+	 = -(pv->pdsc$l_size - pv->pdsc$w_rsa_offset);			\
       (FS)->regs.reg[26].how = REG_SAVED_OFFSET;			\
 									\
       for (i = 0, j = 0; i < 32; i++)					\
 	if (1<<i & pv->pdsc$l_ireg_mask)				\
 	  {								\
 	    (FS)->regs.reg[i].loc.offset				\
-	      = pv->pdsc$l_size - pv->pdsc$w_rsa_offset - 8 * j++;	\
+	      = -(pv->pdsc$l_size - pv->pdsc$w_rsa_offset - 8 * ++j);	\
 	    (FS)->regs.reg[i].how = REG_SAVED_OFFSET;			\
 	  }								\
 									\
diff --git a/gcc/config/alpha/x-vms b/gcc/config/alpha/x-vms
index b8fd74a504db5a69c53432d47121eb3a6ea8914f..f53f1c79510853ed9655557fa068e7d83d860b28 100644
--- a/gcc/config/alpha/x-vms
+++ b/gcc/config/alpha/x-vms
@@ -1,5 +1,5 @@
 # Under VMS, directory names cannot contain dots.
-version=`echo $(gcc_version) | sed -e 's/\./_/g'`
+version:=$(shell echo $(gcc_version) | sed -e 's/\./_/g')
 
 # Rules for linker and compiler wrappers.  These are only useful on
 # a VMS host.