diff --git a/boards.txt b/boards.txt
index 72d110c19a4..22402791690 100644
--- a/boards.txt
+++ b/boards.txt
@@ -5306,6 +5306,153 @@ lolin_s2_pico.menu.DebugLevel.verbose.build.code_debug=5
 
 ##############################################################
 
+lolin_s3.name=LOLIN S3
+lolin_s3.vid.0=0x303a
+lolin_s3.pid.0=0x1001
+
+lolin_s3.bootloader.tool=esptool_py
+lolin_s3.bootloader.tool.default=esptool_py
+
+lolin_s3.upload.tool=esptool_py
+lolin_s3.upload.tool.default=esptool_py
+lolin_s3.upload.tool.network=esp_ota
+
+lolin_s3.upload.maximum_size=1310720
+lolin_s3.upload.maximum_data_size=327680
+lolin_s3.upload.flags=
+lolin_s3.upload.extra_flags=
+lolin_s3.upload.use_1200bps_touch=false
+lolin_s3.upload.wait_for_upload_port=false
+
+lolin_s3.serial.disableDTR=false
+lolin_s3.serial.disableRTS=false
+
+lolin_s3.build.tarch=xtensa
+lolin_s3.build.bootloader_addr=0x0
+lolin_s3.build.target=esp32s3
+lolin_s3.build.mcu=esp32s3
+lolin_s3.build.core=esp32
+lolin_s3.build.variant=lolin_s3
+lolin_s3.build.board=LOLIN_S3
+
+lolin_s3.build.usb_mode=1
+lolin_s3.build.cdc_on_boot=0
+lolin_s3.build.msc_on_boot=0
+lolin_s3.build.dfu_on_boot=0
+lolin_s3.build.f_cpu=240000000L
+lolin_s3.build.flash_size=16MB
+lolin_s3.build.flash_freq=80m
+lolin_s3.build.flash_mode=dio
+lolin_s3.build.boot=qio
+lolin_s3.build.boot_freq=80m
+lolin_s3.build.partitions=default
+lolin_s3.build.defines=-DBOARD_HAS_PSRAM
+lolin_s3.build.loop_core=
+lolin_s3.build.event_core=
+lolin_s3.build.psram_type=opi
+lolin_s3.build.memory_type={build.boot}_{build.psram_type}
+
+lolin_s3.menu.FlashMode.qio=QIO 80MHz
+lolin_s3.menu.FlashMode.qio.build.flash_mode=dio
+lolin_s3.menu.FlashMode.qio.build.boot=qio
+lolin_s3.menu.FlashMode.qio.build.boot_freq=80m
+lolin_s3.menu.FlashMode.qio.build.flash_freq=80m
+lolin_s3.menu.FlashMode.qio120=QIO 120MHz
+lolin_s3.menu.FlashMode.qio120.build.flash_mode=dio
+lolin_s3.menu.FlashMode.qio120.build.boot=qio
+lolin_s3.menu.FlashMode.qio120.build.boot_freq=120m
+lolin_s3.menu.FlashMode.qio120.build.flash_freq=80m
+
+lolin_s3.menu.LoopCore.1=Core 1
+lolin_s3.menu.LoopCore.1.build.loop_core=-DARDUINO_RUNNING_CORE=1
+lolin_s3.menu.LoopCore.0=Core 0
+lolin_s3.menu.LoopCore.0.build.loop_core=-DARDUINO_RUNNING_CORE=0
+
+lolin_s3.menu.EventsCore.1=Core 1
+lolin_s3.menu.EventsCore.1.build.event_core=-DARDUINO_EVENT_RUNNING_CORE=1
+lolin_s3.menu.EventsCore.0=Core 0
+lolin_s3.menu.EventsCore.0.build.event_core=-DARDUINO_EVENT_RUNNING_CORE=0
+
+lolin_s3.menu.USBMode.hwcdc=Hardware CDC and JTAG
+lolin_s3.menu.USBMode.hwcdc.build.usb_mode=1
+lolin_s3.menu.USBMode.default=USB-OTG (TinyUSB)
+lolin_s3.menu.USBMode.default.build.usb_mode=0
+
+lolin_s3.menu.CDCOnBoot.default=Disabled
+lolin_s3.menu.CDCOnBoot.default.build.cdc_on_boot=0
+lolin_s3.menu.CDCOnBoot.cdc=Enabled
+lolin_s3.menu.CDCOnBoot.cdc.build.cdc_on_boot=1
+
+lolin_s3.menu.MSCOnBoot.default=Disabled
+lolin_s3.menu.MSCOnBoot.default.build.msc_on_boot=0
+lolin_s3.menu.MSCOnBoot.msc=Enabled (Requires USB-OTG Mode)
+lolin_s3.menu.MSCOnBoot.msc.build.msc_on_boot=1
+
+lolin_s3.menu.DFUOnBoot.default=Disabled
+lolin_s3.menu.DFUOnBoot.default.build.dfu_on_boot=0
+lolin_s3.menu.DFUOnBoot.dfu=Enabled (Requires USB-OTG Mode)
+lolin_s3.menu.DFUOnBoot.dfu.build.dfu_on_boot=1
+
+lolin_s3.menu.UploadMode.default=UART0 / Hardware CDC
+lolin_s3.menu.UploadMode.default.upload.use_1200bps_touch=false
+lolin_s3.menu.UploadMode.default.upload.wait_for_upload_port=false
+lolin_s3.menu.UploadMode.cdc=USB-OTG CDC (TinyUSB)
+lolin_s3.menu.UploadMode.cdc.upload.use_1200bps_touch=true
+lolin_s3.menu.UploadMode.cdc.upload.wait_for_upload_port=true
+
+lolin_s3.menu.PartitionScheme.fatflash=16M Flash (2MB APP/12.5MB FAT)
+lolin_s3.menu.PartitionScheme.fatflash.build.partitions=ffat
+lolin_s3.menu.PartitionScheme.fatflash.upload.maximum_size=2097152
+lolin_s3.menu.PartitionScheme.app3M_fat9M_16MB=16M Flash (3MB APP/9MB FATFS)
+lolin_s3.menu.PartitionScheme.app3M_fat9M_16MB.build.partitions=app3M_fat9M_16MB
+lolin_s3.menu.PartitionScheme.app3M_fat9M_16MB.upload.maximum_size=3145728
+lolin_s3.menu.PartitionScheme.rainmaker=RainMaker
+lolin_s3.menu.PartitionScheme.rainmaker.build.partitions=rainmaker
+lolin_s3.menu.PartitionScheme.rainmaker.upload.maximum_size=3145728
+
+lolin_s3.menu.CPUFreq.240=240MHz (WiFi)
+lolin_s3.menu.CPUFreq.240.build.f_cpu=240000000L
+lolin_s3.menu.CPUFreq.160=160MHz (WiFi)
+lolin_s3.menu.CPUFreq.160.build.f_cpu=160000000L
+lolin_s3.menu.CPUFreq.80=80MHz (WiFi)
+lolin_s3.menu.CPUFreq.80.build.f_cpu=80000000L
+lolin_s3.menu.CPUFreq.40=40MHz
+lolin_s3.menu.CPUFreq.40.build.f_cpu=40000000L
+lolin_s3.menu.CPUFreq.20=20MHz
+lolin_s3.menu.CPUFreq.20.build.f_cpu=20000000L
+lolin_s3.menu.CPUFreq.10=10MHz
+lolin_s3.menu.CPUFreq.10.build.f_cpu=10000000L
+
+lolin_s3.menu.UploadSpeed.921600=921600
+lolin_s3.menu.UploadSpeed.921600.upload.speed=921600
+lolin_s3.menu.UploadSpeed.115200=115200
+lolin_s3.menu.UploadSpeed.115200.upload.speed=115200
+lolin_s3.menu.UploadSpeed.256000.windows=256000
+lolin_s3.menu.UploadSpeed.256000.upload.speed=256000
+lolin_s3.menu.UploadSpeed.230400.windows.upload.speed=256000
+lolin_s3.menu.UploadSpeed.230400=230400
+lolin_s3.menu.UploadSpeed.230400.upload.speed=230400
+lolin_s3.menu.UploadSpeed.460800.linux=460800
+lolin_s3.menu.UploadSpeed.460800.macosx=460800
+lolin_s3.menu.UploadSpeed.460800.upload.speed=460800
+lolin_s3.menu.UploadSpeed.512000.windows=512000
+lolin_s3.menu.UploadSpeed.512000.upload.speed=512000
+
+lolin_s3.menu.DebugLevel.none=None
+lolin_s3.menu.DebugLevel.none.build.code_debug=0
+lolin_s3.menu.DebugLevel.error=Error
+lolin_s3.menu.DebugLevel.error.build.code_debug=1
+lolin_s3.menu.DebugLevel.warn=Warn
+lolin_s3.menu.DebugLevel.warn.build.code_debug=2
+lolin_s3.menu.DebugLevel.info=Info
+lolin_s3.menu.DebugLevel.info.build.code_debug=3
+lolin_s3.menu.DebugLevel.debug=Debug
+lolin_s3.menu.DebugLevel.debug.build.code_debug=4
+lolin_s3.menu.DebugLevel.verbose=Verbose
+lolin_s3.menu.DebugLevel.verbose.build.code_debug=5
+
+##############################################################
+
 lolin32.name=WEMOS LOLIN32
 
 lolin32.bootloader.tool=esptool_py
diff --git a/variants/lolin_s3/pins_arduino.h b/variants/lolin_s3/pins_arduino.h
new file mode 100644
index 00000000000..46a168c6b7e
--- /dev/null
+++ b/variants/lolin_s3/pins_arduino.h
@@ -0,0 +1,69 @@
+#ifndef Pins_Arduino_h
+#define Pins_Arduino_h
+
+#include <stdint.h>
+
+#define USB_VID 0x303a
+#define USB_PID 0x1001
+
+#define EXTERNAL_NUM_INTERRUPTS 46
+#define NUM_DIGITAL_PINS        48
+#define NUM_ANALOG_INPUTS       18
+
+
+static const uint8_t LED_BUILTIN = 38;
+#define BUILTIN_LED  LED_BUILTIN // backward compatibility
+#define LED_BUILTIN LED_BUILTIN
+#define RGB_BUILTIN LED_BUILTIN
+#define RGB_BRIGHTNESS 64
+
+#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<48)?(p):-1)
+#define digitalPinHasPWM(p)         (p < 46)
+
+static const uint8_t TX = 43;
+static const uint8_t RX = 44;
+
+static const uint8_t SDA = 42;
+static const uint8_t SCL = 41;
+
+static const uint8_t SS    = 10;
+static const uint8_t MOSI  = 11;
+static const uint8_t MISO  = 13;
+static const uint8_t SCK   = 12;
+
+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 A6 = 7;
+static const uint8_t A7 = 8;
+static const uint8_t A8 = 9;
+static const uint8_t A9 = 10;
+static const uint8_t A10 = 11;
+static const uint8_t A11 = 12;
+static const uint8_t A12 = 13;
+static const uint8_t A13 = 14;
+static const uint8_t A14 = 15;
+static const uint8_t A15 = 16;
+static const uint8_t A16 = 17;
+static const uint8_t A17 = 18;
+
+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;
+static const uint8_t T10 = 10;
+static const uint8_t T11 = 11;
+static const uint8_t T12 = 12;
+static const uint8_t T13 = 13;
+static const uint8_t T14 = 14;
+
+#endif /* Pins_Arduino_h */