diff --git a/rtl/ibex_cs_registers.sv b/rtl/ibex_cs_registers.sv
index ef5b1f49..3e88eff2 100644
--- a/rtl/ibex_cs_registers.sv
+++ b/rtl/ibex_cs_registers.sv
@@ -523,6 +523,10 @@ module ibex_cs_registers #(
         csr_rdata_int = '0;
         illegal_csr   = ~DbgTriggerEn;
       end
+      CSR_MSCONTEXT: begin
+        csr_rdata_int = '0;
+        illegal_csr   = ~DbgTriggerEn;
+      end
 
       // Custom CSR for controlling CPU features and reporting CPU status
       CSR_CPUCTRLSTS: begin
diff --git a/rtl/ibex_pkg.sv b/rtl/ibex_pkg.sv
index 33d723bb..02e07383 100644
--- a/rtl/ibex_pkg.sv
+++ b/rtl/ibex_pkg.sv
@@ -471,6 +471,8 @@ package ibex_pkg;
     CSR_PMPADDR14 = 12'h3BE,
     CSR_PMPADDR15 = 12'h3BF,
 
+    CSR_SCONTEXT  = 12'h5A8,
+
     // ePMP control
     CSR_MSECCFG   = 12'h747,
     CSR_MSECCFGH  = 12'h757,
@@ -481,7 +483,7 @@ package ibex_pkg;
     CSR_TDATA2    = 12'h7A2,
     CSR_TDATA3    = 12'h7A3,
     CSR_MCONTEXT  = 12'h7A8,
-    CSR_SCONTEXT  = 12'h7AA,
+    CSR_MSCONTEXT = 12'h7AA,
 
     // Debug/trace
     CSR_DCSR      = 12'h7b0,