diff --git a/cpu/esp_common/Makefile b/cpu/esp_common/Makefile
index 61924b40d1..1777c1af7c 100644
--- a/cpu/esp_common/Makefile
+++ b/cpu/esp_common/Makefile
@@ -21,4 +21,8 @@ ifneq (,$(filter esp_xtensa,$(USEMODULE)))
   DIRS += esp-xtensa
 endif
 
+ifneq (,$(filter esp_riscv,$(USEMODULE)))
+  DIRS += esp-riscv
+endif
+
 include $(RIOTBASE)/Makefile.base
diff --git a/cpu/esp_common/Makefile.dep b/cpu/esp_common/Makefile.dep
index 5df5e6b0b2..36dea9bee4 100644
--- a/cpu/esp_common/Makefile.dep
+++ b/cpu/esp_common/Makefile.dep
@@ -25,6 +25,10 @@ ifeq (xtensa,$(CPU_ARCH))
   USEMODULE += xtensa
 endif
 
+ifeq (riscv_esp32,$(CPU_ARCH))
+  USEMODULE += esp_riscv
+endif
+
 # Features used by ESP*
 
 FEATURES_REQUIRED += newlib
diff --git a/cpu/esp_common/Makefile.features b/cpu/esp_common/Makefile.features
index d40e13e162..4298cfc8fc 100644
--- a/cpu/esp_common/Makefile.features
+++ b/cpu/esp_common/Makefile.features
@@ -28,6 +28,10 @@ ifeq (xtensa,$(CPU_ARCH))
   FEATURES_PROVIDED += arch_esp_xtensa
 endif
 
+ifeq (riscv_esp32,$(CPU_ARCH))
+  FEATURES_PROVIDED += arch_esp_riscv
+endif
+
 FEATURES_CONFLICT += esp_wifi_ap:esp_now
 FEATURES_CONFLICT_MSG += "ESP_NOW and ESP_WIFI_AP can not be used at the same time."
 
diff --git a/cpu/esp_common/esp-riscv/Makefile b/cpu/esp_common/esp-riscv/Makefile
new file mode 100644
index 0000000000..cd102285bc
--- /dev/null
+++ b/cpu/esp_common/esp-riscv/Makefile
@@ -0,0 +1,3 @@
+MODULE=esp_riscv
+
+include $(RIOTBASE)/Makefile.base