diff --git a/bochs/cpu/cpu.h b/bochs/cpu/cpu.h
index e3a392e9b..2b22bccc6 100644
--- a/bochs/cpu/cpu.h
+++ b/bochs/cpu/cpu.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////
-// $Id: cpu.h,v 1.612 2009-10-08 18:07:50 sshwarts Exp $
+// $Id: cpu.h,v 1.613 2009-10-12 20:50:14 sshwarts Exp $
 /////////////////////////////////////////////////////////////////////////
 //
 //  Copyright (C) 2001  MandrakeSoft S.A.
@@ -3183,7 +3183,7 @@ public: // for now...
   BX_SMF bx_bool fetch_raw_descriptor2(const bx_selector_t *selector,
                          Bit32u *dword1, Bit32u *dword2) BX_CPP_AttrRegparmN(3);
   BX_SMF void    load_seg_reg(bx_segment_reg_t *seg, Bit16u new_value) BX_CPP_AttrRegparmN(2);
-  BX_SMF void    load_null_selector(bx_segment_reg_t *seg) BX_CPP_AttrRegparmN(1);
+  BX_SMF void    load_null_selector(bx_segment_reg_t *seg, unsigned value) BX_CPP_AttrRegparmN(2);
 #if BX_SUPPORT_X86_64
   BX_SMF void    fetch_raw_descriptor_64(const bx_selector_t *selector,
                          Bit32u *dword1, Bit32u *dword2, Bit32u *dword3, unsigned exception_no);
diff --git a/bochs/cpu/iret.cc b/bochs/cpu/iret.cc
index 087477995..b4b386319 100755
--- a/bochs/cpu/iret.cc
+++ b/bochs/cpu/iret.cc
@@ -1,5 +1,5 @@
 ////////////////////////////////////////////////////////////////////////
-// $Id: iret.cc,v 1.44 2009-04-05 19:09:44 sshwarts Exp $
+// $Id: iret.cc,v 1.45 2009-10-12 20:50:14 sshwarts Exp $
 /////////////////////////////////////////////////////////////////////////
 //
 //   Copyright (c) 2005 Stanislav Shwartsman
@@ -541,7 +541,7 @@ BX_CPU_C::long_iret(bxInstruction_c *i)
     }
     else {
       // we are in 64-bit mode !
-      load_null_selector(&BX_CPU_THIS_PTR sregs[BX_SEG_REG_SS]);
+      load_null_selector(&BX_CPU_THIS_PTR sregs[BX_SEG_REG_SS], raw_ss_selector);
       loadSRegLMNominal(BX_SEG_REG_SS, raw_ss_selector, cs_selector.rpl);
     }
 
diff --git a/bochs/cpu/segment_ctrl_pro.cc b/bochs/cpu/segment_ctrl_pro.cc
index 39b8c317a..5235053b9 100644
--- a/bochs/cpu/segment_ctrl_pro.cc
+++ b/bochs/cpu/segment_ctrl_pro.cc
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////
-// $Id: segment_ctrl_pro.cc,v 1.120 2009-10-02 16:09:08 sshwarts Exp $
+// $Id: segment_ctrl_pro.cc,v 1.121 2009-10-12 20:50:14 sshwarts Exp $
 /////////////////////////////////////////////////////////////////////////
 //
 //  Copyright (C) 2001  MandrakeSoft S.A.
@@ -47,7 +47,7 @@ BX_CPU_C::load_seg_reg(bx_segment_reg_t *seg, Bit16u new_value)
 #if BX_SUPPORT_X86_64
         // allow SS = 0 in 64 bit mode only with cpl != 3 and rpl=cpl
         if (Is64BitMode() && CPL != 3 && ss_selector.rpl == CPL) {
-          load_null_selector(seg);
+          load_null_selector(seg, new_value);
           return;
         }
 #endif
@@ -112,7 +112,7 @@ BX_CPU_C::load_seg_reg(bx_segment_reg_t *seg, Bit16u new_value)
       Bit32u dword1, dword2;
 
       if ((new_value & 0xfffc) == 0) { /* null selector */
-        load_null_selector(seg);
+        load_null_selector(seg, new_value);
         return;
       }
 
@@ -213,13 +213,15 @@ BX_CPU_C::load_seg_reg(bx_segment_reg_t *seg, Bit16u new_value)
   }
 }
 
-  void BX_CPP_AttrRegparmN(1)
-BX_CPU_C::load_null_selector(bx_segment_reg_t *seg)
+  void BX_CPP_AttrRegparmN(2)
+BX_CPU_C::load_null_selector(bx_segment_reg_t *seg, unsigned value)
 {
+  BX_ASSERT((value & 0xfffc) == 0);
+
   seg->selector.index = 0;
   seg->selector.ti    = 0;
-  seg->selector.rpl   = 0;
-  seg->selector.value = 0;
+  seg->selector.rpl   = BX_SELECTOR_RPL(value);
+  seg->selector.value = value;
 
   seg->cache.valid    = 0; /* invalidate null selector */
   seg->cache.p        = 0;