diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 07301396b8..b9de792552 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2007-10-30  Markus Deuling  <deuling@de.ibm.com>
+
+	* alphabsd-nat.c (alphabsd_fetch_inferior_registers)
+	(alphabsd_store_inferior_registers): Use get_regcache_arch to get at
+	the current architecture by regcache.
+
 2007-10-30  Markus Deuling  <deuling@de.ibm.com>
 
 	* ada-lang.c (ada_language_arch_info): Replace current_gdbarch by
diff --git a/gdb/alphabsd-nat.c b/gdb/alphabsd-nat.c
index 1f7f62f058..a166691fd6 100644
--- a/gdb/alphabsd-nat.c
+++ b/gdb/alphabsd-nat.c
@@ -99,7 +99,7 @@ alphabsd_fetch_inferior_registers (struct regcache *regcache, int regno)
 	return;
     }
 
-  if (regno == -1 || regno >= gdbarch_fp0_regnum (current_gdbarch))
+  if (regno == -1 || regno >= gdbarch_fp0_regnum (get_regcache_arch (regcache)))
     {
       struct fpreg fpregs;
 
@@ -134,7 +134,7 @@ alphabsd_store_inferior_registers (struct regcache *regcache, int regno)
 	return;
     }
 
-  if (regno == -1 || regno >= gdbarch_fp0_regnum (current_gdbarch))
+  if (regno == -1 || regno >= gdbarch_fp0_regnum (get_regcache_arch (regcache)))
     {
       struct fpreg fpregs;