diff --git a/cpu/esp32/Makefile b/cpu/esp32/Makefile
index c570c11c42..1294cc435c 100644
--- a/cpu/esp32/Makefile
+++ b/cpu/esp32/Makefile
@@ -2,6 +2,7 @@
 MODULE = cpu
 
 # Add a list of subdirectories, that should also be built:
+DIRS += $(RIOTCPU)/esp_common
 DIRS += periph
 DIRS += freertos
 DIRS += vendor
@@ -14,10 +15,6 @@ ifneq (, $(filter esp_eth, $(USEMODULE)))
     DIRS += esp-eth
 endif
 
-ifneq (, $(filter esp_now, $(USEMODULE)))
-    DIRS += esp-now
-endif
-
 ifneq (, $(filter esp_wifi, $(USEMODULE)))
     DIRS += esp-wifi
 endif
diff --git a/cpu/esp8266/Makefile b/cpu/esp8266/Makefile
index 63d422f20d..d1c2d71d34 100644
--- a/cpu/esp8266/Makefile
+++ b/cpu/esp8266/Makefile
@@ -2,6 +2,7 @@
 MODULE = cpu
 
 # Add a list of subdirectories, that should also be built:
+DIRS += $(RIOTCPU)/esp_common
 DIRS += periph
 DIRS += sdk
 DIRS += vendor
diff --git a/cpu/esp_common/Makefile b/cpu/esp_common/Makefile
new file mode 100644
index 0000000000..ee13d7895c
--- /dev/null
+++ b/cpu/esp_common/Makefile
@@ -0,0 +1,6 @@
+# add a list of subdirectories, that should also be build
+ifneq (, $(filter esp_now, $(USEMODULE)))
+    DIRS += esp-now
+endif
+
+include $(RIOTBASE)/Makefile.base
diff --git a/cpu/esp_common/doc.txt b/cpu/esp_common/doc.txt
new file mode 100644
index 0000000000..9d7db29a6f
--- /dev/null
+++ b/cpu/esp_common/doc.txt
@@ -0,0 +1,5 @@
+/**
+ * @defgroup    cpu_esp_common ESP Common
+ * @brief       Common modules for Espressif ESP SoCs
+ * @ingroup     cpu
+ */