Index: /trunk/src/VBox/VMM/VMMAll/IEMAll.cpp
===================================================================
--- /trunk/src/VBox/VMM/VMMAll/IEMAll.cpp	(revision 92552)
+++ /trunk/src/VBox/VMM/VMMAll/IEMAll.cpp	(revision 92553)
@@ -7079,9 +7079,11 @@
         pFpuCtx->FPUIP = pVCpu->cpum.GstCtx.eip | ((uint32_t)pVCpu->cpum.GstCtx.cs.Sel << 4);
     }
-    else
+    else if (!IEM_IS_LONG_MODE(pVCpu))
     {
         pFpuCtx->CS    = pVCpu->cpum.GstCtx.cs.Sel;
         pFpuCtx->FPUIP = pVCpu->cpum.GstCtx.rip;
     }
+    else
+        *(uint64_t *)&pFpuCtx->FPUIP = pVCpu->cpum.GstCtx.rip;
 }
 
@@ -7116,9 +7118,11 @@
         pFpuCtx->FPUDP = (uint32_t)GCPtrEff + ((uint32_t)sel << 4);
     }
-    else
+    else if (!IEM_IS_LONG_MODE(pVCpu))
     {
         pFpuCtx->DS    = sel;
         pFpuCtx->FPUDP = GCPtrEff;
     }
+    else
+        *(uint64_t *)&pFpuCtx->FPUDP = GCPtrEff;
 }
 
