diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index bae6abedc9..57d986f8d1 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2007-10-30  Markus Deuling  <deuling@de.ibm.com>
+
+	* avr-tdep.c (avr_frame_unwind_cache, avr_frame_prev_register): Use
+	get_frame_arch to get at the current architecture by frame_info.
+
 2007-10-30  Markus Deuling  <deuling@de.ibm.com>
 
 	* arm-tdep.c (arm_get_next_pc): Replace current_gdbarch by gdbarch.
diff --git a/gdb/avr-tdep.c b/gdb/avr-tdep.c
index a19e927b41..db2fd0f5fd 100644
--- a/gdb/avr-tdep.c
+++ b/gdb/avr-tdep.c
@@ -928,7 +928,7 @@ avr_frame_unwind_cache (struct frame_info *next_frame,
 
   /* Adjust all the saved registers so that they contain addresses and not
      offsets.  */
-  for (i = 0; i < gdbarch_num_regs (current_gdbarch) - 1; i++)
+  for (i = 0; i < gdbarch_num_regs (get_frame_arch (next_frame)) - 1; i++)
     if (info->saved_regs[i].addr)
       {
         info->saved_regs[i].addr = (info->prev_sp - info->saved_regs[i].addr);
@@ -1046,9 +1046,9 @@ avr_frame_prev_register (struct frame_info *next_frame,
               buf[1] = tmp;
 
               pc = (extract_unsigned_integer (buf, 2) * 2);
-              store_unsigned_integer (bufferp,
-                                      register_size (current_gdbarch, regnum),
-                                      pc);
+              store_unsigned_integer
+		(bufferp, register_size (get_frame_arch (next_frame), regnum),
+		 pc);
             }
         }
     }