diff --git a/boards.txt b/boards.txt
index 4a64ecc65b0..5163a2d84c9 100644
--- a/boards.txt
+++ b/boards.txt
@@ -3339,6 +3339,175 @@ um_feathers3.menu.EraseFlash.all.upload.erase_cmd=-e
 
 ##############################################################
 
+um_feathers3neo.name=UM FeatherS3 Neo
+um_feathers3neo.vid.0=0x303a
+um_feathers3neo.pid.0=0x81FB
+um_feathers3neo.upload_port.0.vid=0x303a
+um_feathers3neo.upload_port.0.pid=0x81FB
+
+um_feathers3neo.bootloader.tool=esptool_py
+um_feathers3neo.bootloader.tool.default=esptool_py
+
+um_feathers3neo.upload.tool=esptool_py
+um_feathers3neo.upload.tool.default=esptool_py
+um_feathers3neo.upload.tool.network=esp_ota
+
+um_feathers3neo.upload.maximum_size=1310720
+um_feathers3neo.upload.maximum_data_size=327680
+um_feathers3neo.upload.flags=
+um_feathers3neo.upload.extra_flags=
+um_feathers3neo.upload.use_1200bps_touch=false
+um_feathers3neo.upload.wait_for_upload_port=false
+
+um_feathers3neo.serial.disableDTR=false
+um_feathers3neo.serial.disableRTS=false
+
+um_feathers3neo.build.tarch=xtensa
+um_feathers3neo.build.bootloader_addr=0x0
+um_feathers3neo.build.target=esp32s3
+um_feathers3neo.build.mcu=esp32s3
+um_feathers3neo.build.core=esp32
+um_feathers3neo.build.variant=um_feathers3neo
+um_feathers3neo.build.board=FEATHERS3NEO
+
+um_feathers3neo.build.usb_mode=1
+um_feathers3neo.build.cdc_on_boot=1
+um_feathers3neo.build.msc_on_boot=0
+um_feathers3neo.build.dfu_on_boot=0
+um_feathers3neo.build.f_cpu=240000000L
+um_feathers3neo.build.flash_size=16MB
+um_feathers3neo.build.flash_freq=80m
+um_feathers3neo.build.flash_mode=dio
+um_feathers3neo.build.boot=qio
+um_feathers3neo.build.partitions=default
+um_feathers3neo.build.defines=
+um_feathers3neo.build.loop_core=
+um_feathers3neo.build.event_core=
+um_feathers3neo.build.flash_type=qio
+um_feathers3neo.build.psram_type=qspi
+um_feathers3neo.build.memory_type=qio_qspi
+
+um_feathers3neo.menu.LoopCore.1=Core 1
+um_feathers3neo.menu.LoopCore.1.build.loop_core=-DARDUINO_RUNNING_CORE=1
+um_feathers3neo.menu.LoopCore.0=Core 0
+um_feathers3neo.menu.LoopCore.0.build.loop_core=-DARDUINO_RUNNING_CORE=0
+
+um_feathers3neo.menu.EventsCore.1=Core 1
+um_feathers3neo.menu.EventsCore.1.build.event_core=-DARDUINO_EVENT_RUNNING_CORE=1
+um_feathers3neo.menu.EventsCore.0=Core 0
+um_feathers3neo.menu.EventsCore.0.build.event_core=-DARDUINO_EVENT_RUNNING_CORE=0
+
+um_feathers3neo.menu.USBMode.hwcdc=Hardware CDC and JTAG
+um_feathers3neo.menu.USBMode.hwcdc.build.usb_mode=1
+um_feathers3neo.menu.USBMode.default=USB-OTG (TinyUSB)
+um_feathers3neo.menu.USBMode.default.build.usb_mode=0
+
+um_feathers3neo.menu.CDCOnBoot.cdc=Enabled
+um_feathers3neo.menu.CDCOnBoot.cdc.build.cdc_on_boot=1
+um_feathers3neo.menu.CDCOnBoot.default=Disabled
+um_feathers3neo.menu.CDCOnBoot.default.build.cdc_on_boot=0
+
+um_feathers3neo.menu.MSCOnBoot.default=Disabled
+um_feathers3neo.menu.MSCOnBoot.default.build.msc_on_boot=0
+um_feathers3neo.menu.MSCOnBoot.msc=Enabled (Requires USB-OTG Mode)
+um_feathers3neo.menu.MSCOnBoot.msc.build.msc_on_boot=1
+
+um_feathers3neo.menu.DFUOnBoot.default=Disabled
+um_feathers3neo.menu.DFUOnBoot.default.build.dfu_on_boot=0
+um_feathers3neo.menu.DFUOnBoot.dfu=Enabled (Requires USB-OTG Mode)
+um_feathers3neo.menu.DFUOnBoot.dfu.build.dfu_on_boot=1
+
+um_feathers3neo.menu.UploadMode.cdc.upload.wait_for_upload_port=true
+um_feathers3neo.menu.UploadMode.default=UART0 / Hardware CDC
+um_feathers3neo.menu.UploadMode.cdc=USB-OTG CDC (TinyUSB)
+um_feathers3neo.menu.UploadMode.cdc.upload.use_1200bps_touch=true
+um_feathers3neo.menu.UploadMode.default.upload.use_1200bps_touch=false
+um_feathers3neo.menu.UploadMode.default.upload.wait_for_upload_port=false
+
+um_feathers3neo.menu.PSRAM.enabled=Enabled
+um_feathers3neo.menu.PSRAM.enabled.build.defines=-DBOARD_HAS_PSRAM
+um_feathers3neo.menu.PSRAM.disabled=Disabled
+um_feathers3neo.menu.PSRAM.disabled.build.defines=
+
+um_feathers3neo.menu.PartitionScheme.default_8MB=8M with spiffs (3MB APP/1.5MB SPIFFS)
+um_feathers3neo.menu.PartitionScheme.default_8MB.build.partitions=default_8MB
+um_feathers3neo.menu.PartitionScheme.default_8MB.upload.maximum_size=3342336
+um_feathers3neo.menu.PartitionScheme.minimal=Minimal (1.3MB APP/700KB SPIFFS)
+um_feathers3neo.menu.PartitionScheme.minimal.build.partitions=minimal
+um_feathers3neo.menu.PartitionScheme.no_ota=No OTA (2MB APP/2MB SPIFFS)
+um_feathers3neo.menu.PartitionScheme.no_ota.build.partitions=no_ota
+um_feathers3neo.menu.PartitionScheme.no_ota.upload.maximum_size=2097152
+um_feathers3neo.menu.PartitionScheme.noota_3g=No OTA (1MB APP/3MB SPIFFS)
+um_feathers3neo.menu.PartitionScheme.noota_3g.build.partitions=noota_3g
+um_feathers3neo.menu.PartitionScheme.noota_3g.upload.maximum_size=1048576
+um_feathers3neo.menu.PartitionScheme.noota_ffat=No OTA (2MB APP/2MB FATFS)
+um_feathers3neo.menu.PartitionScheme.noota_ffat.build.partitions=noota_ffat
+um_feathers3neo.menu.PartitionScheme.noota_ffat.upload.maximum_size=2097152
+um_feathers3neo.menu.PartitionScheme.noota_3gffat=No OTA (1MB APP/3MB FATFS)
+um_feathers3neo.menu.PartitionScheme.noota_3gffat.build.partitions=noota_3gffat
+um_feathers3neo.menu.PartitionScheme.noota_3gffat.upload.maximum_size=1048576
+um_feathers3neo.menu.PartitionScheme.huge_app=Huge APP (3MB No OTA/1MB SPIFFS)
+um_feathers3neo.menu.PartitionScheme.huge_app.build.partitions=huge_app
+um_feathers3neo.menu.PartitionScheme.huge_app.upload.maximum_size=3145728
+um_feathers3neo.menu.PartitionScheme.min_spiffs=Minimal SPIFFS (1.9MB APP with OTA/190KB SPIFFS)
+um_feathers3neo.menu.PartitionScheme.min_spiffs.build.partitions=min_spiffs
+um_feathers3neo.menu.PartitionScheme.min_spiffs.upload.maximum_size=1966080
+
+um_feathers3neo.menu.CPUFreq.240=240MHz (WiFi)
+um_feathers3neo.menu.CPUFreq.240.build.f_cpu=240000000L
+um_feathers3neo.menu.CPUFreq.160=160MHz (WiFi)
+um_feathers3neo.menu.CPUFreq.160.build.f_cpu=160000000L
+um_feathers3neo.menu.CPUFreq.80=80MHz (WiFi)
+um_feathers3neo.menu.CPUFreq.80.build.f_cpu=80000000L
+um_feathers3neo.menu.CPUFreq.40=40MHz
+um_feathers3neo.menu.CPUFreq.40.build.f_cpu=40000000L
+um_feathers3neo.menu.CPUFreq.20=20MHz
+um_feathers3neo.menu.CPUFreq.20.build.f_cpu=20000000L
+um_feathers3neo.menu.CPUFreq.10=10MHz
+um_feathers3neo.menu.CPUFreq.10.build.f_cpu=10000000L
+
+um_feathers3neo.menu.FlashMode.qio=QIO
+um_feathers3neo.menu.FlashMode.qio.build.flash_mode=dio
+um_feathers3neo.menu.FlashMode.qio.build.boot=qio
+um_feathers3neo.menu.FlashMode.dio=DIO
+um_feathers3neo.menu.FlashMode.dio.build.flash_mode=dio
+um_feathers3neo.menu.FlashMode.dio.build.boot=dio
+
+um_feathers3neo.menu.UploadSpeed.921600=921600
+um_feathers3neo.menu.UploadSpeed.921600.upload.speed=921600
+um_feathers3neo.menu.UploadSpeed.115200=115200
+um_feathers3neo.menu.UploadSpeed.115200.upload.speed=115200
+um_feathers3neo.menu.UploadSpeed.256000.windows=256000
+um_feathers3neo.menu.UploadSpeed.256000.upload.speed=256000
+um_feathers3neo.menu.UploadSpeed.230400.windows.upload.speed=256000
+um_feathers3neo.menu.UploadSpeed.230400=230400
+um_feathers3neo.menu.UploadSpeed.230400.upload.speed=230400
+um_feathers3neo.menu.UploadSpeed.460800.linux=460800
+um_feathers3neo.menu.UploadSpeed.460800.macosx=460800
+um_feathers3neo.menu.UploadSpeed.460800.upload.speed=460800
+um_feathers3neo.menu.UploadSpeed.512000.windows=512000
+um_feathers3neo.menu.UploadSpeed.512000.upload.speed=512000
+
+um_feathers3neo.menu.DebugLevel.none=None
+um_feathers3neo.menu.DebugLevel.none.build.code_debug=0
+um_feathers3neo.menu.DebugLevel.error=Error
+um_feathers3neo.menu.DebugLevel.error.build.code_debug=1
+um_feathers3neo.menu.DebugLevel.warn=Warn
+um_feathers3neo.menu.DebugLevel.warn.build.code_debug=2
+um_feathers3neo.menu.DebugLevel.info=Info
+um_feathers3neo.menu.DebugLevel.info.build.code_debug=3
+um_feathers3neo.menu.DebugLevel.debug=Debug
+um_feathers3neo.menu.DebugLevel.debug.build.code_debug=4
+um_feathers3neo.menu.DebugLevel.verbose=Verbose
+um_feathers3neo.menu.DebugLevel.verbose.build.code_debug=5
+
+um_feathers3neo.menu.EraseFlash.none=Disabled
+um_feathers3neo.menu.EraseFlash.none.upload.erase_cmd=
+um_feathers3neo.menu.EraseFlash.all=Enabled
+um_feathers3neo.menu.EraseFlash.all.upload.erase_cmd=-e
+
+##############################################################
+
 um_nanos3.name=UM NanoS3
 um_nanos3.vid.0=0x303a
 um_nanos3.pid.0=0x8179
diff --git a/variants/um_feathers3neo/pins_arduino.h b/variants/um_feathers3neo/pins_arduino.h
new file mode 100644
index 00000000000..c0a1aae867e
--- /dev/null
+++ b/variants/um_feathers3neo/pins_arduino.h
@@ -0,0 +1,69 @@
+#ifndef Pins_Arduino_h
+#define Pins_Arduino_h
+
+#include <stdint.h>
+#include "soc/soc_caps.h"
+
+#define USB_VID          0x303A
+#define USB_PID          0x81FB
+#define USB_MANUFACTURER "Unexpected Maker"
+#define USB_PRODUCT      "FeatherS3 Neo"
+#define USB_SERIAL       ""
+
+static const uint8_t TX = 43;
+static const uint8_t RX = 44;
+
+static const uint8_t SDA = 8;
+static const uint8_t SCL = 9;
+
+static const uint8_t SS = 5;
+static const uint8_t MOSI = 35;
+static const uint8_t MISO = 37;
+static const uint8_t SDO = 35;
+static const uint8_t SDI = 37;
+static const uint8_t SCK = 36;
+
+static const uint8_t A0 = 17;
+static const uint8_t A1 = 18;
+static const uint8_t A2 = 14;
+static const uint8_t A3 = 12;
+static const uint8_t A4 = 6;
+static const uint8_t A5 = 5;
+static const uint8_t A6 = 1;
+static const uint8_t A7 = 3;
+static const uint8_t A8 = 7;
+static const uint8_t A9 = 10;
+static const uint8_t A10 = 11;
+static const uint8_t A11 = 8;
+static const uint8_t A12 = 9;
+
+static const uint8_t T1 = 1;
+static const uint8_t T3 = 3;
+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;
+static const uint8_t T10 = 10;
+static const uint8_t T11 = 11;
+static const uint8_t T12 = 12;
+static const uint8_t T14 = 14;
+
+static const uint8_t VBAT_SENSE = 2;
+static const uint8_t VBUS_SENSE = 15;
+
+// User LED
+#define LED_BUILTIN 13
+#define BUILTIN_LED LED_BUILTIN  // backward compatibility
+
+static const uint8_t RGB_DATA = 40;
+// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite()
+#define RGB_BUILTIN    (RGB_DATA + SOC_GPIO_PIN_COUNT)
+#define RGB_BRIGHTNESS 64
+
+static const uint8_t RGB_PWR = 39;
+static const uint8_t RGB_MATRIX_PWR = 39;
+static const uint8_t RGB_MATRIX_DATA = 16;
+static const uint8_t LED = 13;
+
+#endif /* Pins_Arduino_h */