diff --git a/bochs/gui/win32dialog.cc b/bochs/gui/win32dialog.cc
index aaa8cbce9..7dbe8e1e3 100644
--- a/bochs/gui/win32dialog.cc
+++ b/bochs/gui/win32dialog.cc
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////
-// $Id: win32dialog.cc,v 1.57 2007-08-25 13:11:53 akrisak Exp $
+// $Id: win32dialog.cc,v 1.58 2007-09-27 21:21:21 vruppert Exp $
 /////////////////////////////////////////////////////////////////////////
 
 #include "config.h"
@@ -918,6 +918,17 @@ static BOOL CALLBACK DebuggerDlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM
     case WM_INITDIALOG:
       GetWindowRect(hDlg, &R);
 #if BX_SUPPORT_SAVE_RESTORE
+#if BX_SUPPORT_X86_64
+      cpu_param[0] = SIM->get_param_num("cpu.0.RAX", SIM->get_sr_root());
+      cpu_param[1] = SIM->get_param_num("cpu.0.RBX", SIM->get_sr_root());
+      cpu_param[2] = SIM->get_param_num("cpu.0.RCX", SIM->get_sr_root());
+      cpu_param[3] = SIM->get_param_num("cpu.0.RDX", SIM->get_sr_root());
+      cpu_param[4] = SIM->get_param_num("cpu.0.RSP", SIM->get_sr_root());
+      cpu_param[5] = SIM->get_param_num("cpu.0.RBP", SIM->get_sr_root());
+      cpu_param[6] = SIM->get_param_num("cpu.0.RSI", SIM->get_sr_root());
+      cpu_param[7] = SIM->get_param_num("cpu.0.RDI", SIM->get_sr_root());
+      cpu_param[8] = SIM->get_param_num("cpu.0.RIP", SIM->get_sr_root());
+#else
       cpu_param[0] = SIM->get_param_num("cpu.0.EAX", SIM->get_sr_root());
       cpu_param[1] = SIM->get_param_num("cpu.0.EBX", SIM->get_sr_root());
       cpu_param[2] = SIM->get_param_num("cpu.0.ECX", SIM->get_sr_root());
@@ -927,6 +938,7 @@ static BOOL CALLBACK DebuggerDlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM
       cpu_param[6] = SIM->get_param_num("cpu.0.ESI", SIM->get_sr_root());
       cpu_param[7] = SIM->get_param_num("cpu.0.EDI", SIM->get_sr_root());
       cpu_param[8] = SIM->get_param_num("cpu.0.EIP", SIM->get_sr_root());
+#endif
       cpu_param[9] = SIM->get_param_num("cpu.0.CS.selector", SIM->get_sr_root());
       cpu_param[10] = SIM->get_param_num("cpu.0.DS.selector", SIM->get_sr_root());
       cpu_param[11] = SIM->get_param_num("cpu.0.ES.selector", SIM->get_sr_root());