diff --git a/src/target/riscv/riscv-011.c b/src/target/riscv/riscv-011.c
index 88ae14d08c..4b8740bcf7 100644
--- a/src/target/riscv/riscv-011.c
+++ b/src/target/riscv/riscv-011.c
@@ -1771,10 +1771,10 @@ static riscv_error_t handle_halt_routine(struct target *target)
 					reg = S0;
 					break;
 				case 31:
-					reg = CSR_DPC;
+					reg = GDB_REGNO_DPC;
 					break;
 				case 32:
-					reg = CSR_DCSR;
+					reg = GDB_REGNO_DCSR;
 					break;
 				default:
 					assert(0);
@@ -1808,8 +1808,8 @@ static riscv_error_t handle_halt_routine(struct target *target)
 	}
 
 	/* TODO: get rid of those 2 variables and talk to the cache directly. */
-	info->dpc = reg_cache_get(target, CSR_DPC);
-	info->dcsr = reg_cache_get(target, CSR_DCSR);
+	info->dpc = reg_cache_get(target, GDB_REGNO_DPC);
+	info->dcsr = reg_cache_get(target, GDB_REGNO_DCSR);
 
 	cache_invalidate(target);