diff --git a/.github/firmware-targets.json b/.github/firmware-targets.json
index 1db52be..76678ad 100644
--- a/.github/firmware-targets.json
+++ b/.github/firmware-targets.json
@@ -48,6 +48,15 @@
       "flash_freq": "80m",
       "bootloader_offset": "0x0000"
     },
+    {
+      "env": "esp32-s3-N4R2",
+      "family": "esp32",
+      "chip": "esp32-s3",
+      "flash_size": "4MB",
+      "flash_mode": "dio",
+      "flash_freq": "80m",
+      "bootloader_offset": "0x0000"
+    },
     {
       "env": "esp32-s3-N32R8",
       "family": "esp32",
diff --git a/platformio.ini b/platformio.ini
index bb77f4f..effae4e 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -48,6 +48,7 @@ default_envs =
 	esp32-c3-N16
 	esp32-c6-N4
 	esp32-N4
+	esp32-s3-N4R2
 
 [env]
 lib_deps =
@@ -249,6 +250,28 @@ board_upload.maximum_ram_size = 327680
 board_upload.flash_size = 8MB
 monitor_speed = 115200
 
+; ESP32-S3 N4R2 -- 4 MB flash + 2 MB quad PSRAM (Waveshare ESP32-S3-Zero and the
+; other S3 mini boards built on ESP32-S3FH4R2).
+[env:esp32-s3-N4R2]
+platform = https://github.com/pioarduino/platform-espressif32/releases/download/55.03.39/platform-espressif32.zip
+framework = arduino
+build_flags =
+  -DTARGET_ESP32
+  -DOPENDISPLAY_ENABLE_WIFI  ; LAN transport + ROM tinfl. Set ONLY on -DBOARD_HAS_PSRAM envs (src/wifi_service.h)
+  -DOPENDISPLAY_ZLIB_USE_HEAP_WINDOW=1
+  -DBOARD_HAS_PSRAM
+  -DARDUINO_USB_MODE=1
+  -DARDUINO_USB_CDC_ON_BOOT=1
+  -DCONFIG_FREERTOS_WATCHDOG_TIMEOUT_S=120
+board_build.filesystem = littlefs
+board = esp32-s3-devkitc-1
+board_build.partitions = huge_app.csv
+board_build.arduino.memory_type = qio_qspi
+board_build.psram_type = qspi
+board_build.usb_mode = hardware
+board_upload.flash_size = 4MB
+monitor_speed = 115200
+
 [env:esp32-s3-N32R8]
 platform = https://github.com/pioarduino/platform-espressif32/releases/download/55.03.39/platform-espressif32.zip
 framework = arduino