diff --git a/GNUmakefile b/GNUmakefile
index cdc41fc212..99a654ca7f 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -915,6 +915,8 @@ ifneq ($(XTENSA), 0)
 	@$(MD5SUM) test.bin
 	$(TINYGO) build -size short -o test.bin -target mch2022             examples/machinetest
 	@$(MD5SUM) test.bin
+	$(TINYGO) build -size short -o test.bin -target=xiao-esp32s3   		examples/blinky1
+	@$(MD5SUM) test.bin
 endif
 	$(TINYGO) build -size short -o test.bin -target=esp-c3-32s-kit      examples/blinky1
 	@$(MD5SUM) test.bin
diff --git a/src/machine/board_xiao-esp32s3.go b/src/machine/board_xiao-esp32s3.go
new file mode 100644
index 0000000000..9181bffc2e
--- /dev/null
+++ b/src/machine/board_xiao-esp32s3.go
@@ -0,0 +1,58 @@
+//go:build xiao_esp32s3
+
+// This file contains the pin mappings for the Seeed XIAO ESP32S3 boards.
+//
+// Seeed Studio XIAO ESP32S3 is an IoT mini development board based on
+// the Espressif ESP32-S3 WiFi/Bluetooth dual-mode chip.
+//
+// - https://www.seeedstudio.com/XIAO-ESP32S3-p-5627.html
+// - https://wiki.seeedstudio.com/xiao_esp32s3_getting_started/
+
+package machine
+
+// Digital Pins
+const (
+	D0  = GPIO1
+	D1  = GPIO2
+	D2  = GPIO3
+	D3  = GPIO4
+	D4  = GPIO5
+	D5  = GPIO6
+	D6  = GPIO43
+	D7  = GPIO44
+	D8  = GPIO7
+	D9  = GPIO8
+	D10 = GPIO9
+)
+
+// Analog pins
+const (
+	A0 = GPIO1
+	A1 = GPIO2
+	A2 = GPIO3
+	A3 = GPIO4
+)
+
+// UART pins
+const (
+	UART_RX_PIN = GPIO44
+	UART_TX_PIN = GPIO43
+)
+
+// I2C pins
+const (
+	SDA_PIN = GPIO5
+	SCL_PIN = GPIO6
+)
+
+// SPI pins
+const (
+	SPI_SCK_PIN = GPIO7
+	SPI_SDI_PIN = GPIO9
+	SPI_SDO_PIN = GPIO8
+)
+
+// Onboard LEDs
+const (
+	LED = GPIO21
+)
diff --git a/targets/xiao-esp32s3.json b/targets/xiao-esp32s3.json
new file mode 100644
index 0000000000..82fd72bb19
--- /dev/null
+++ b/targets/xiao-esp32s3.json
@@ -0,0 +1,4 @@
+{
+	"inherits": ["esp32s3"],
+	"build-tags": ["xiao_esp32s3"]
+}