diff --git a/bochs/cpu/string.cc b/bochs/cpu/string.cc
index 3743e9d02..3be0c0360 100644
--- a/bochs/cpu/string.cc
+++ b/bochs/cpu/string.cc
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////
-// $Id: string.cc,v 1.26 2004-11-26 19:53:04 sshwarts Exp $
+// $Id: string.cc,v 1.27 2005-02-22 18:24:19 sshwarts Exp $
 /////////////////////////////////////////////////////////////////////////
 //
 //  Copyright (C) 2001  MandrakeSoft S.A.
@@ -1835,6 +1835,8 @@ void BX_CPU_C::STOSQ_YqRAX(bxInstruction_c *i)
       /* increment EDI */
       rdi += 8;
     }
+
+    RDI = rdi;
   }
   else /* 32 bit address size */
   {
diff --git a/bochs/gdbstub.cc b/bochs/gdbstub.cc
index ff3a57c8a..7ab77515b 100644
--- a/bochs/gdbstub.cc
+++ b/bochs/gdbstub.cc
@@ -713,8 +713,8 @@ static void debug_loop(void)
             PUTREG(buf, RDX, 8);
             PUTREG(buf, RSI, 8);
             PUTREG(buf, RDI, 8);
-            PUTREG(buf, RSP, 8);
             PUTREG(buf, RBP, 8);
+            PUTREG(buf, RSP, 8);
             PUTREG(buf, R8,  8);
             PUTREG(buf, R9,  8);
             PUTREG(buf, R10, 8);