diff --git a/Makefile b/Makefile
index a5401a9d..4e3e67c2 100644
--- a/Makefile
+++ b/Makefile
@@ -490,6 +490,8 @@ ifneq ($(XTENSA), 0)
 endif
 	$(TINYGO) build -size short -o test.bin -target=esp32c3           	examples/serial
 	@$(MD5SUM) test.bin
+	$(TINYGO) build -size short -o test.bin -target=m5stamp-c3          examples/serial
+	@$(MD5SUM) test.bin
 	$(TINYGO) build -size short -o test.hex -target=hifive1b            examples/blinky1
 	@$(MD5SUM) test.hex
 	$(TINYGO) build -size short -o test.hex -target=hifive1-qemu        examples/serial
diff --git a/README.md b/README.md
index 4a250185..9e24ea3a 100644
--- a/README.md
+++ b/README.md
@@ -43,7 +43,7 @@ See the [getting started instructions](https://tinygo.org/getting-started/) for
 
 You can compile TinyGo programs for microcontrollers, WebAssembly and Linux.
 
-The following 78 microcontroller boards are currently supported:
+The following 79 microcontroller boards are currently supported:
 
 * [Adafruit Circuit Playground Bluefruit](https://www.adafruit.com/product/4333)
 * [Adafruit Circuit Playground Express](https://www.adafruit.com/product/3333)
@@ -88,6 +88,7 @@ The following 78 microcontroller boards are currently supported:
 * [Game Boy Advance](https://en.wikipedia.org/wiki/Game_Boy_Advance)
 * [M5Stack](https://docs.m5stack.com/en/core/basic)
 * [M5Stack Core2](https://shop.m5stack.com/products/m5stack-core2-esp32-iot-development-kit)
+* [M5Stamp C3](https://docs.m5stack.com/en/core/stamp_c3)
 * [Makerdiary nRF52840-MDK](https://wiki.makerdiary.com/nrf52840-mdk/)
 * [Makerdiary nRF52840-MDK USB Dongle](https://wiki.makerdiary.com/nrf52840-mdk-usb-dongle/)
 * [Microchip SAM E54 Xplained Pro](https://www.microchip.com/developmenttools/productdetails/atsame54-xpro)
diff --git a/src/machine/board_m5stamp_c3.go b/src/machine/board_m5stamp_c3.go
new file mode 100644
index 00000000..bb73c108
--- /dev/null
+++ b/src/machine/board_m5stamp_c3.go
@@ -0,0 +1,49 @@
+//go:build m5stamp_c3
+// +build m5stamp_c3
+
+package machine
+
+const (
+	IO0  Pin = 0
+	IO1  Pin = 1
+	IO2  Pin = 2
+	IO3  Pin = 3
+	IO4  Pin = 4
+	IO5  Pin = 5
+	IO6  Pin = 6
+	IO7  Pin = 7
+	IO8  Pin = 8
+	IO9  Pin = 9
+	IO10 Pin = 10
+	IO11 Pin = 11
+	IO12 Pin = 12
+	IO13 Pin = 13
+	IO14 Pin = 14
+	IO15 Pin = 15
+	IO16 Pin = 16
+	IO17 Pin = 17
+	IO18 Pin = 18
+	IO19 Pin = 19
+	IO20 Pin = 20
+	IO21 Pin = 21
+
+	XTAL_32K_P = IO0
+	XTAL_32K_N = IO1
+	MTMS       = IO4
+	MTDI       = IO5
+	MTCK       = IO6
+	MTDO       = IO7
+	VDD_SPI    = IO11
+	SPIHD      = IO12
+	SPISP      = IO13
+	SPICS0     = IO14
+	SPICLK     = IO15
+	SPID       = IO16
+	SPIQ       = IO17
+	U0RXD      = IO20
+	U0TXD      = IO21
+)
+
+const (
+	WS2812 = IO2
+)
diff --git a/targets/m5stamp-c3.json b/targets/m5stamp-c3.json
new file mode 100644
index 00000000..d35ca702
--- /dev/null
+++ b/targets/m5stamp-c3.json
@@ -0,0 +1,6 @@
+{
+	"inherits": ["esp32c3"],
+	"build-tags": ["m5stamp_c3"],
+	"serial-port": ["acm:1a86:55d4"]
+}
+