diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 7c0cc5203f..59463e9062 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2007-04-14  Ulrich Weigand  <uweigand@de.ibm.com>
+
+	* alpha-tdep.c (alpha_software_single_step): Do not call write_pc
+	when removing single-step breakpoints.
+
 2007-04-14  Vladimir Prus  <vladimir@codesourcery.com>
 
 	* varobj.h (varobj_set_frozen): New
diff --git a/gdb/alpha-tdep.c b/gdb/alpha-tdep.c
index 9c7b621c17..1c8f95d8e7 100644
--- a/gdb/alpha-tdep.c
+++ b/gdb/alpha-tdep.c
@@ -1521,7 +1521,7 @@ alpha_next_pc (CORE_ADDR pc)
 int
 alpha_software_single_step (enum target_signal sig, int insert_breakpoints_p)
 {
-  static CORE_ADDR next_pc;
+  CORE_ADDR next_pc;
   CORE_ADDR pc;
 
   if (insert_breakpoints_p)
@@ -1534,7 +1534,6 @@ alpha_software_single_step (enum target_signal sig, int insert_breakpoints_p)
   else
     {
       remove_single_step_breakpoints ();
-      write_pc (next_pc);
     }
   return 1;
 }