diff --git a/boards.txt b/boards.txt
index 5c97e19d847..b04a316fdcf 100644
--- a/boards.txt
+++ b/boards.txt
@@ -19779,7 +19779,7 @@ AirM2M_CORE_ESP32C3.menu.EraseFlash.all.upload.erase_cmd=-e
 
 XIAO_ESP32C3.name=XIAO_ESP32C3
 XIAO_ESP32C3.vid.0=0x2886
-XIAO_ESP32C3.pid.0=0x0047
+XIAO_ESP32C3.pid.0=0x0046
 
 XIAO_ESP32C3.bootloader.tool=esptool_py
 XIAO_ESP32C3.bootloader.tool.default=esptool_py
@@ -19931,6 +19931,186 @@ XIAO_ESP32C3.menu.EraseFlash.all.upload.erase_cmd=-e
 
 ##############################################################
 
+
+XIAO_ESP32S3.name=XIAO_ESP32S3
+XIAO_ESP32S3.vid.0=0x2886
+XIAO_ESP32S3.pid.0=0x0056
+XIAO_ESP32S3.vid.1=0x2886
+XIAO_ESP32S3.pid.1=0x8056
+
+XIAO_ESP32S3.bootloader.tool=esptool_py
+XIAO_ESP32S3.bootloader.tool.default=esptool_py
+
+XIAO_ESP32S3.upload.tool=esptool_py
+XIAO_ESP32S3.upload.tool.default=esptool_py
+XIAO_ESP32S3.upload.tool.network=esp_ota
+
+XIAO_ESP32S3.upload.maximum_size=1310720
+XIAO_ESP32S3.upload.maximum_data_size=327680
+XIAO_ESP32S3.upload.flags=
+XIAO_ESP32S3.upload.extra_flags=
+XIAO_ESP32S3.upload.use_1200bps_touch=false
+XIAO_ESP32S3.upload.wait_for_upload_port=false
+
+XIAO_ESP32S3.serial.disableDTR=false
+XIAO_ESP32S3.serial.disableRTS=false
+
+XIAO_ESP32S3.build.tarch=xtensa
+XIAO_ESP32S3.build.bootloader_addr=0x0
+XIAO_ESP32S3.build.target=esp32s3
+XIAO_ESP32S3.build.mcu=esp32s3
+XIAO_ESP32S3.build.core=esp32
+XIAO_ESP32S3.build.variant=XIAO_ESP32S3
+XIAO_ESP32S3.build.board=XIAO_ESP32S3
+
+XIAO_ESP32S3.build.usb_mode=0
+XIAO_ESP32S3.build.cdc_on_boot=1
+XIAO_ESP32S3.build.msc_on_boot=0
+XIAO_ESP32S3.build.dfu_on_boot=0
+XIAO_ESP32S3.build.f_cpu=240000000L
+XIAO_ESP32S3.build.flash_size=8MB
+XIAO_ESP32S3.build.flash_freq=80m
+XIAO_ESP32S3.build.flash_mode=dio
+XIAO_ESP32S3.build.boot=qio
+XIAO_ESP32S3.build.boot_freq=80m
+XIAO_ESP32S3.build.partitions=default_8MB
+XIAO_ESP32S3.build.defines=
+XIAO_ESP32S3.build.loop_core=
+XIAO_ESP32S3.build.event_core=
+XIAO_ESP32S3.build.psram_type=qspi
+XIAO_ESP32S3.build.memory_type={build.boot}_{build.psram_type}
+
+XIAO_ESP32S3.menu.JTAGAdapter.default=Disabled
+XIAO_ESP32S3.menu.JTAGAdapter.default.build.copy_jtag_files=0
+XIAO_ESP32S3.menu.JTAGAdapter.builtin=Integrated USB JTAG
+XIAO_ESP32S3.menu.JTAGAdapter.builtin.build.openocdscript=esp32s3-builtin.cfg
+XIAO_ESP32S3.menu.JTAGAdapter.builtin.build.copy_jtag_files=1
+XIAO_ESP32S3.menu.JTAGAdapter.external=FTDI Adapter
+XIAO_ESP32S3.menu.JTAGAdapter.external.build.openocdscript=esp32s3-ftdi.cfg
+XIAO_ESP32S3.menu.JTAGAdapter.external.build.copy_jtag_files=1
+XIAO_ESP32S3.menu.JTAGAdapter.bridge=ESP USB Bridge
+XIAO_ESP32S3.menu.JTAGAdapter.bridge.build.openocdscript=esp32s3-bridge.cfg
+XIAO_ESP32S3.menu.JTAGAdapter.bridge.build.copy_jtag_files=1
+
+XIAO_ESP32S3.menu.PSRAM.disabled=Disabled
+XIAO_ESP32S3.menu.PSRAM.disabled.build.defines=
+XIAO_ESP32S3.menu.PSRAM.disabled.build.psram_type=qspi
+XIAO_ESP32S3.menu.PSRAM.opi=OPI PSRAM
+XIAO_ESP32S3.menu.PSRAM.opi.build.defines=-DBOARD_HAS_PSRAM
+XIAO_ESP32S3.menu.PSRAM.opi.build.psram_type=opi
+
+XIAO_ESP32S3.menu.FlashMode.qio=QIO 80MHz
+XIAO_ESP32S3.menu.FlashMode.qio.build.flash_mode=dio
+XIAO_ESP32S3.menu.FlashMode.qio.build.boot=qio
+XIAO_ESP32S3.menu.FlashMode.qio.build.boot_freq=80m
+XIAO_ESP32S3.menu.FlashMode.qio.build.flash_freq=80m
+XIAO_ESP32S3.menu.FlashMode.dio=DIO 80MHz
+XIAO_ESP32S3.menu.FlashMode.dio.build.flash_mode=dio
+XIAO_ESP32S3.menu.FlashMode.dio.build.boot=dio
+XIAO_ESP32S3.menu.FlashMode.dio.build.boot_freq=80m
+XIAO_ESP32S3.menu.FlashMode.dio.build.flash_freq=80m
+
+XIAO_ESP32S3.menu.FlashSize.8M=8MB (64Mb)
+XIAO_ESP32S3.menu.FlashSize.8M.build.flash_size=8MB
+XIAO_ESP32S3.menu.FlashSize.8M.build.partitions=default_8MB
+
+XIAO_ESP32S3.menu.LoopCore.1=Core 1
+XIAO_ESP32S3.menu.LoopCore.1.build.loop_core=-DARDUINO_RUNNING_CORE=1
+XIAO_ESP32S3.menu.LoopCore.0=Core 0
+XIAO_ESP32S3.menu.LoopCore.0.build.loop_core=-DARDUINO_RUNNING_CORE=0
+
+XIAO_ESP32S3.menu.EventsCore.1=Core 1
+XIAO_ESP32S3.menu.EventsCore.1.build.event_core=-DARDUINO_EVENT_RUNNING_CORE=1
+XIAO_ESP32S3.menu.EventsCore.0=Core 0
+XIAO_ESP32S3.menu.EventsCore.0.build.event_core=-DARDUINO_EVENT_RUNNING_CORE=0
+
+XIAO_ESP32S3.menu.USBMode.hwcdc=Hardware CDC and JTAG
+XIAO_ESP32S3.menu.USBMode.hwcdc.build.usb_mode=1
+XIAO_ESP32S3.menu.USBMode.default=USB-OTG (TinyUSB)
+XIAO_ESP32S3.menu.USBMode.default.build.usb_mode=0
+
+XIAO_ESP32S3.menu.CDCOnBoot.default=Enabled
+XIAO_ESP32S3.menu.CDCOnBoot.default.build.cdc_on_boot=1
+XIAO_ESP32S3.menu.CDCOnBoot.cdc=Disabled
+XIAO_ESP32S3.menu.CDCOnBoot.cdc.build.cdc_on_boot=0
+
+XIAO_ESP32S3.menu.MSCOnBoot.default=Disabled
+XIAO_ESP32S3.menu.MSCOnBoot.default.build.msc_on_boot=0
+XIAO_ESP32S3.menu.MSCOnBoot.msc=Enabled (Requires USB-OTG Mode)
+XIAO_ESP32S3.menu.MSCOnBoot.msc.build.msc_on_boot=1
+
+XIAO_ESP32S3.menu.DFUOnBoot.default=Disabled
+XIAO_ESP32S3.menu.DFUOnBoot.default.build.dfu_on_boot=0
+XIAO_ESP32S3.menu.DFUOnBoot.dfu=Enabled (Requires USB-OTG Mode)
+XIAO_ESP32S3.menu.DFUOnBoot.dfu.build.dfu_on_boot=1
+
+XIAO_ESP32S3.menu.UploadMode.default=UART0 / Hardware CDC
+XIAO_ESP32S3.menu.UploadMode.default.upload.use_1200bps_touch=false
+XIAO_ESP32S3.menu.UploadMode.default.upload.wait_for_upload_port=false
+XIAO_ESP32S3.menu.UploadMode.cdc=USB-OTG CDC (TinyUSB)
+XIAO_ESP32S3.menu.UploadMode.cdc.upload.use_1200bps_touch=true
+XIAO_ESP32S3.menu.UploadMode.cdc.upload.wait_for_upload_port=true
+
+XIAO_ESP32S3.menu.PartitionScheme.default_8MB=Default with spiffs (3MB APP/1.5MB SPIFFS)
+XIAO_ESP32S3.menu.PartitionScheme.default_8MB.build.partitions=default_8MB
+XIAO_ESP32S3.menu.PartitionScheme.default_8MB.upload.maximum_size=3342336
+XIAO_ESP32S3.menu.PartitionScheme.max_app_8MB=Maximum APP (7.9MB APP No OTA/No FS)
+XIAO_ESP32S3.menu.PartitionScheme.max_app_8MB.build.partitions=max_app_8MB
+XIAO_ESP32S3.menu.PartitionScheme.max_app_8MB.upload.maximum_size=8257536
+XIAO_ESP32S3.menu.PartitionScheme.tinyuf2=TinyUF2 8MB (2MB APP/3.7MB FFAT)
+XIAO_ESP32S3.menu.PartitionScheme.tinyuf2.build.custom_bootloader=bootloader-tinyuf2
+XIAO_ESP32S3.menu.PartitionScheme.tinyuf2.build.custom_partitions=partitions-8MB-tinyuf2
+XIAO_ESP32S3.menu.PartitionScheme.tinyuf2.upload.maximum_size=2097152
+XIAO_ESP32S3.menu.PartitionScheme.tinyuf2.upload.extra_flags=0x410000 "{runtime.platform.path}/variants/{build.variant}/tinyuf2.bin"
+
+XIAO_ESP32S3.menu.CPUFreq.240=240MHz (WiFi)
+XIAO_ESP32S3.menu.CPUFreq.240.build.f_cpu=240000000L
+XIAO_ESP32S3.menu.CPUFreq.160=160MHz (WiFi)
+XIAO_ESP32S3.menu.CPUFreq.160.build.f_cpu=160000000L
+XIAO_ESP32S3.menu.CPUFreq.80=80MHz (WiFi)
+XIAO_ESP32S3.menu.CPUFreq.80.build.f_cpu=80000000L
+XIAO_ESP32S3.menu.CPUFreq.40=40MHz
+XIAO_ESP32S3.menu.CPUFreq.40.build.f_cpu=40000000L
+XIAO_ESP32S3.menu.CPUFreq.20=20MHz
+XIAO_ESP32S3.menu.CPUFreq.20.build.f_cpu=20000000L
+XIAO_ESP32S3.menu.CPUFreq.10=10MHz
+XIAO_ESP32S3.menu.CPUFreq.10.build.f_cpu=10000000L
+
+XIAO_ESP32S3.menu.UploadSpeed.921600=921600
+XIAO_ESP32S3.menu.UploadSpeed.921600.upload.speed=921600
+XIAO_ESP32S3.menu.UploadSpeed.115200=115200
+XIAO_ESP32S3.menu.UploadSpeed.115200.upload.speed=115200
+XIAO_ESP32S3.menu.UploadSpeed.256000.windows=256000
+XIAO_ESP32S3.menu.UploadSpeed.256000.upload.speed=256000
+XIAO_ESP32S3.menu.UploadSpeed.230400.windows.upload.speed=256000
+XIAO_ESP32S3.menu.UploadSpeed.230400=230400
+XIAO_ESP32S3.menu.UploadSpeed.230400.upload.speed=230400
+XIAO_ESP32S3.menu.UploadSpeed.460800.linux=460800
+XIAO_ESP32S3.menu.UploadSpeed.460800.macosx=460800
+XIAO_ESP32S3.menu.UploadSpeed.460800.upload.speed=460800
+XIAO_ESP32S3.menu.UploadSpeed.512000.windows=512000
+XIAO_ESP32S3.menu.UploadSpeed.512000.upload.speed=512000
+
+XIAO_ESP32S3.menu.DebugLevel.none=None
+XIAO_ESP32S3.menu.DebugLevel.none.build.code_debug=0
+XIAO_ESP32S3.menu.DebugLevel.error=Error
+XIAO_ESP32S3.menu.DebugLevel.error.build.code_debug=1
+XIAO_ESP32S3.menu.DebugLevel.warn=Warn
+XIAO_ESP32S3.menu.DebugLevel.warn.build.code_debug=2
+XIAO_ESP32S3.menu.DebugLevel.info=Info
+XIAO_ESP32S3.menu.DebugLevel.info.build.code_debug=3
+XIAO_ESP32S3.menu.DebugLevel.debug=Debug
+XIAO_ESP32S3.menu.DebugLevel.debug.build.code_debug=4
+XIAO_ESP32S3.menu.DebugLevel.verbose=Verbose
+XIAO_ESP32S3.menu.DebugLevel.verbose.build.code_debug=5
+
+XIAO_ESP32S3.menu.EraseFlash.none=Disabled
+XIAO_ESP32S3.menu.EraseFlash.none.upload.erase_cmd=
+XIAO_ESP32S3.menu.EraseFlash.all=Enabled
+XIAO_ESP32S3.menu.EraseFlash.all.upload.erase_cmd=-e
+
+##############################################################
+
 connaxio_espoir.name=Connaxio's Espoir
 connaxio_espoir.vid.0=0x10C4
 connaxio_espoir.pid.0=0x8D9A
diff --git a/libraries/ESP32/examples/Camera/CameraWebServer/CameraWebServer.ino b/libraries/ESP32/examples/Camera/CameraWebServer/CameraWebServer.ino
index 702a557dde4..009de6e1e52 100644
--- a/libraries/ESP32/examples/Camera/CameraWebServer/CameraWebServer.ino
+++ b/libraries/ESP32/examples/Camera/CameraWebServer/CameraWebServer.ino
@@ -23,6 +23,7 @@
 //#define CAMERA_MODEL_M5STACK_UNITCAM // No PSRAM
 //#define CAMERA_MODEL_AI_THINKER // Has PSRAM
 //#define CAMERA_MODEL_TTGO_T_JOURNAL // No PSRAM
+//#define CAMERA_MODEL_XIAO_ESP32S3 // Has PSRAM
 // ** Espressif Internal Boards **
 //#define CAMERA_MODEL_ESP32_CAM_BOARD
 //#define CAMERA_MODEL_ESP32S2_CAM_BOARD
diff --git a/libraries/ESP32/examples/Camera/CameraWebServer/camera_pins.h b/libraries/ESP32/examples/Camera/CameraWebServer/camera_pins.h
index 1c1890348ad..d5d51a21e07 100644
--- a/libraries/ESP32/examples/Camera/CameraWebServer/camera_pins.h
+++ b/libraries/ESP32/examples/Camera/CameraWebServer/camera_pins.h
@@ -176,6 +176,24 @@
 #define HREF_GPIO_NUM     26
 #define PCLK_GPIO_NUM     21
 
+#elif defined(CAMERA_MODEL_XIAO_ESP32S3)
+#define PWDN_GPIO_NUM     -1
+#define RESET_GPIO_NUM    -1
+#define XCLK_GPIO_NUM     10
+#define SIOD_GPIO_NUM     40
+#define SIOC_GPIO_NUM     39
+
+#define Y9_GPIO_NUM       48
+#define Y8_GPIO_NUM       11
+#define Y7_GPIO_NUM       12
+#define Y6_GPIO_NUM       14
+#define Y5_GPIO_NUM       16
+#define Y4_GPIO_NUM       18
+#define Y3_GPIO_NUM       17
+#define Y2_GPIO_NUM       15
+#define VSYNC_GPIO_NUM    38
+#define HREF_GPIO_NUM     47
+#define PCLK_GPIO_NUM     13
 
 #elif defined(CAMERA_MODEL_ESP32_CAM_BOARD)
 // The 18 pin header on the board has Y5 and Y3 swapped
diff --git a/variants/XIAO_ESP32S3/bootloader-tinyuf2.bin b/variants/XIAO_ESP32S3/bootloader-tinyuf2.bin
new file mode 100644
index 00000000000..b11e5b236f0
Binary files /dev/null and b/variants/XIAO_ESP32S3/bootloader-tinyuf2.bin differ
diff --git a/variants/XIAO_ESP32S3/partitions-8MB.csv b/variants/XIAO_ESP32S3/partitions-8MB.csv
new file mode 100644
index 00000000000..4026378b6fb
--- /dev/null
+++ b/variants/XIAO_ESP32S3/partitions-8MB.csv
@@ -0,0 +1,10 @@
+# ESP-IDF Partition Table
+# Name,   Type, SubType, Offset,  Size, Flags
+# bootloader.bin,,          0x1000, 32K
+# partition table,,         0x8000, 4K
+nvs,      data, nvs,      0x9000,  20K,
+otadata,  data, ota,      0xe000,  8K,
+ota_0,    0,    ota_0,   0x10000,  2048K,
+ota_1,    0,    ota_1,  0x210000,  2048K,
+uf2,      app,  factory,0x410000,  256K,
+ffat,     data, fat,    0x450000,  3776K,
diff --git a/variants/XIAO_ESP32S3/pins_arduino.h b/variants/XIAO_ESP32S3/pins_arduino.h
new file mode 100644
index 00000000000..975b5717097
--- /dev/null
+++ b/variants/XIAO_ESP32S3/pins_arduino.h
@@ -0,0 +1,65 @@
+#ifndef Pins_Arduino_h
+#define Pins_Arduino_h
+
+#include <stdint.h>
+#include "soc/soc_caps.h"
+
+#define USB_VID 0x2886
+#define USB_PID 0x0056
+
+#define EXTERNAL_NUM_INTERRUPTS 46
+#define NUM_DIGITAL_PINS        48
+#define NUM_ANALOG_INPUTS       20
+
+static const uint8_t LED_BUILTIN = 21;
+#define BUILTIN_LED  LED_BUILTIN // backward compatibility
+#define LED_BUILTIN LED_BUILTIN
+
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):-1)
+#define digitalPinHasPWM(p)         (p < EXTERNAL_NUM_INTERRUPTS)
+
+static const uint8_t TX = 43;
+static const uint8_t RX = 44;
+
+static const uint8_t SDA = 5;
+static const uint8_t SCL = 6;
+
+static const uint8_t SS   = 44;
+static const uint8_t MOSI = 9;
+static const uint8_t MISO = 8;
+static const uint8_t SCK  = 7;
+
+static const uint8_t A0 = 1;
+static const uint8_t A1 = 2;
+static const uint8_t A2 = 3;
+static const uint8_t A3 = 4;
+static const uint8_t A4 = 5;
+static const uint8_t A5 = 6;
+static const uint8_t A8 = 7;
+static const uint8_t A9 = 8;
+static const uint8_t A10 = 9;
+
+static const uint8_t D0 = 1;
+static const uint8_t D1 = 2;
+static const uint8_t D2 = 3;
+static const uint8_t D3 = 4;
+static const uint8_t D4 = 5;
+static const uint8_t D5 = 6;
+static const uint8_t D6 = 43;
+static const uint8_t D7 = 44;
+static const uint8_t D8 = 7;
+static const uint8_t D9 = 8;
+static const uint8_t D10 = 9;
+
+static const uint8_t T1 = 1;
+static const uint8_t T2 = 2;
+static const uint8_t T3 = 3;
+static const uint8_t T4 = 4;
+static const uint8_t T5 = 5;
+static const uint8_t T6 = 6;
+static const uint8_t T7 = 7;
+static const uint8_t T8 = 8;
+static const uint8_t T9 = 9;
+
+#endif /* Pins_Arduino_h */
diff --git a/variants/XIAO_ESP32S3/tinyuf2.bin b/variants/XIAO_ESP32S3/tinyuf2.bin
new file mode 100644
index 00000000000..86d981f8019
Binary files /dev/null and b/variants/XIAO_ESP32S3/tinyuf2.bin differ