diff --git a/ports/esp32/main_esp32/idf_component.yml b/ports/esp32/main_esp32/idf_component.yml
new file mode 100644
index 0000000000..8be21ed2fb
--- /dev/null
+++ b/ports/esp32/main_esp32/idf_component.yml
@@ -0,0 +1,5 @@
+## IDF Component Manager Manifest File
+dependencies:
+  espressif/mdns: "~1.1.0"
+  idf:
+    version: ">=5.0.2"
diff --git a/ports/esp32/main_esp32c3/idf_component.yml b/ports/esp32/main_esp32c3/idf_component.yml
new file mode 100644
index 0000000000..8be21ed2fb
--- /dev/null
+++ b/ports/esp32/main_esp32c3/idf_component.yml
@@ -0,0 +1,5 @@
+## IDF Component Manager Manifest File
+dependencies:
+  espressif/mdns: "~1.1.0"
+  idf:
+    version: ">=5.0.2"
diff --git a/ports/esp32/main_esp32s2/idf_component.yml b/ports/esp32/main_esp32s2/idf_component.yml
index fe3213bd26..69e27bf8b5 100644
--- a/ports/esp32/main_esp32s2/idf_component.yml
+++ b/ports/esp32/main_esp32s2/idf_component.yml
@@ -1,5 +1,6 @@
 ## IDF Component Manager Manifest File
 dependencies:
+  espressif/mdns: "~1.1.0"
+  espressif/esp_tinyusb: "~1.0.0"
   idf:
     version: ">=5.0.2"
-  espressif/esp_tinyusb: "~1.0.0"
diff --git a/ports/esp32/main_esp32s3/idf_component.yml b/ports/esp32/main_esp32s3/idf_component.yml
index fe3213bd26..69e27bf8b5 100644
--- a/ports/esp32/main_esp32s3/idf_component.yml
+++ b/ports/esp32/main_esp32s3/idf_component.yml
@@ -1,5 +1,6 @@
 ## IDF Component Manager Manifest File
 dependencies:
+  espressif/mdns: "~1.1.0"
+  espressif/esp_tinyusb: "~1.0.0"
   idf:
     version: ">=5.0.2"
-  espressif/esp_tinyusb: "~1.0.0"
diff --git a/ports/esp32/modsocket.c b/ports/esp32/modsocket.c
index 7484fce786..ba1fe096f6 100644
--- a/ports/esp32/modsocket.c
+++ b/ports/esp32/modsocket.c
@@ -58,6 +58,10 @@
 #define MDNS_QUERY_TIMEOUT_MS (5000)
 #define MDNS_LOCAL_SUFFIX ".local"
 
+#ifndef NO_QSTR
+#include "mdns.h"
+#endif
+
 enum {
     SOCKET_STATE_NEW,
     SOCKET_STATE_CONNECTED,
diff --git a/ports/esp32/mpconfigport.h b/ports/esp32/mpconfigport.h
index b18681bb57..e97980c36f 100644
--- a/ports/esp32/mpconfigport.h
+++ b/ports/esp32/mpconfigport.h
@@ -221,11 +221,11 @@ typedef long mp_off_t;
 #endif
 
 #ifndef MICROPY_HW_ENABLE_MDNS_QUERIES
-#define MICROPY_HW_ENABLE_MDNS_QUERIES      (0)
+#define MICROPY_HW_ENABLE_MDNS_QUERIES      (1)
 #endif
 
 #ifndef MICROPY_HW_ENABLE_MDNS_RESPONDER
-#define MICROPY_HW_ENABLE_MDNS_RESPONDER    (0)
+#define MICROPY_HW_ENABLE_MDNS_RESPONDER    (1)
 #endif
 
 #ifndef MICROPY_BOARD_STARTUP
diff --git a/ports/esp32/network_wlan.c b/ports/esp32/network_wlan.c
index cfedd898cd..3c88f8db86 100644
--- a/ports/esp32/network_wlan.c
+++ b/ports/esp32/network_wlan.c
@@ -42,6 +42,10 @@
 #include "esp_wifi.h"
 #include "esp_log.h"
 
+#ifndef NO_QSTR
+#include "mdns.h"
+#endif
+
 #if MICROPY_PY_NETWORK_WLAN
 
 #if (WIFI_MODE_STA & WIFI_MODE_AP != WIFI_MODE_NULL || WIFI_MODE_STA | WIFI_MODE_AP != WIFI_MODE_APSTA)