diff --git a/boards/seeed_xiao_esp32c6.json b/boards/seeed_xiao_esp32c6.json
new file mode 100644
index 000000000..224f0e215
--- /dev/null
+++ b/boards/seeed_xiao_esp32c6.json
@@ -0,0 +1,48 @@
+{
+  "build": {
+    "core": "esp32",
+    "extra_flags": [
+      "-DARDUINO_XIAO_ESP32C6",
+      "-DARDUINO_USB_MODE=1",
+      "-DARDUINO_USB_CDC_ON_BOOT=1"
+    ],
+    "f_cpu": "160000000L",
+    "f_flash": "80000000L",
+    "flash_mode": "qio",
+    "hwids": [
+      [
+        "0x2886",
+        "0x0046"
+      ],
+      [
+        "0x303a",
+        "0x1001"
+      ]
+    ],
+    "mcu": "esp32c6",
+    "variant": "XIAO_ESP32C6"
+  },
+  "connectivity": [
+    "wifi",
+    "bluetooth",
+    "zigbee",
+    "thread"
+  ],
+  "debug": {
+    "openocd_target": "esp32c6.cfg"
+  },
+  "frameworks": [
+    "arduino",
+    "espidf"
+  ],
+  "name": "Seeed Studio XIAO ESP32C6",
+  "upload": {
+    "flash_size": "4MB",
+    "maximum_ram_size": 327680,
+    "maximum_size": 4194304,
+    "require_upload_port": true,
+    "speed": 460800
+  },
+  "url": "https://wiki.seeedstudio.com/XIAO_ESP32C6_Getting_Started/",
+  "vendor": "Seeed Studio"
+}
diff --git a/pio_local.ini_example b/pio_local.ini_example
index 843dc51d2..5c9aec57a 100644
--- a/pio_local.ini_example
+++ b/pio_local.ini_example
@@ -56,7 +56,7 @@ custom_emsesp_ip = 192.168.1.223 ; E32V2
 lib_deps =
   bblanchon/ArduinoJson @ 7.4.2
   ESP32Async/AsyncTCP @ 3.4.7
-  ESP32Async/ESPAsyncWebServer @ 3.7.10
+  ESP32Async/ESPAsyncWebServer @ 3.8.0
   file://${PROJECT_DIR}/../modules/EMS-ESP-Modules
 ;   ; https://github.com/emsesp/EMS-ESP-Modules.git @ 1.0.8
 
@@ -65,7 +65,7 @@ framework = arduino
 board_build.partitions = partitions/esp32_partition_16M.csv
 board_upload.flash_size = 16MB
 board_build.app_partition_name = app0
-; platform = espressif32@6.11.0 ; Arduino Core v2.0.17 / IDF v4.4.7
+; platform = espressif32@6.12.0 ; Arduino Core v2.0.17 / IDF v4.4.7
 ; platform = https://github.com/pioarduino/platform-espressif32/releases/download/54.03.20/platform-espressif32.zip ; Arduino Core v3.2.0 / ESP-IDF v5.4.1
 platform = https://github.com/pioarduino/platform-espressif32/releases/download/55.03.30/platform-espressif32.zip ; Arduino Core 3.3.0, IDF 5.5.0
 
diff --git a/platformio.ini b/platformio.ini
index 423343c3e..31748ace1 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -61,7 +61,7 @@ framework = arduino
 board_build.partitions = partitions/esp32_partition_16M.csv
 board_upload.flash_size = 16MB
 board_build.app_partition_name = app0
-platform = espressif32@6.11.0 ; Arduino Core v2.0.17 / IDF v4.4.7
+platform = espressif32@6.12.0 ; Arduino Core v2.0.17 / IDF v4.4.7
 
 ; 32MB Flash variants
 [espressif32_base_32M]
@@ -69,7 +69,7 @@ framework = arduino
 board_build.partitions = partitions/esp32_partition_32M.csv
 board_upload.flash_size = 32MB
 board_build.app_partition_name = app0
-platform = espressif32@6.11.0 ; Arduino Core 2.0.17 / IDF 4.4.7
+platform = espressif32@6.12.0 ; Arduino Core 2.0.17 / IDF 4.4.7
 
 ; use Tasmota's library for 4MB Flash variants.
 ; Removes libs (like mbedtsl, so no WiFi_secure.h) to increase available heap
@@ -109,7 +109,7 @@ board_build.filesystem = littlefs
 lib_deps =
   bblanchon/ArduinoJson @ 7.4.2
   ESP32Async/AsyncTCP @ 3.4.7
-  ESP32Async/ESPAsyncWebServer @ 3.7.10
+  ESP32Async/ESPAsyncWebServer @ 3.8.0
   https://github.com/emsesp/EMS-ESP-Modules.git @ 1.0.8
 
 ;
@@ -164,6 +164,18 @@ build_flags =
   ${common.build_flags}
   -DBOARD_C3_MINI_V1
 
+; XIAO ESP32C - 512KB SRAM & 4MB Flash - https://wiki.seeedstudio.com/xiao_esp32c6_getting_started/
+[env:c6]
+framework = arduino
+board_build.partitions = partitions/esp32_partition_4M.csv
+board_upload.flash_size = 4MB
+board_build.app_partition_name = app0
+platform = https://github.com/pioarduino/platform-espressif32/releases/download/54.03.21-2/platform-espressif32.zip ; Arduino Release v3.2.1 based on ESP-IDF v5.4.2
+; platform = https://github.com/pioarduino/platform-espressif32/releases/download/55.03.30-2/platform-espressif32.zip ; Arduino Release v3.3.0 based on ESP-IDF v5.5.0 
+board = seeed_xiao_esp32c6
+build_flags =
+  ${common.build_flags}
+  -DBOARD_C6
 ; 
 ; Building and testing natively, standalone without an ESP32.
 ; See https://docs.platformio.org/en/latest/platforms/native.html