diff --git a/litex/soc/cores/cpu/__init__.py b/litex/soc/cores/cpu/__init__.py
index 3a52fcdbd..870a96967 100644
--- a/litex/soc/cores/cpu/__init__.py
+++ b/litex/soc/cores/cpu/__init__.py
@@ -93,6 +93,8 @@ def check_format_cpu_variant(variant):
 	# Support the old style which used underscore for separator
     if variant is None:
         variant = "standard"
+    if variant == "debug":
+        variant = "standard+debug"
     variant = variant.replace('_', '+')
 
     # Check for valid CPU variants.