diff --git a/boards.txt b/boards.txt
index 701c063296e..34b9329e4bc 100755
--- a/boards.txt
+++ b/boards.txt
@@ -3408,6 +3408,93 @@ lolin_s2_mini.menu.DebugLevel.verbose.build.code_debug=5
 
 ##############################################################
 
+lolin_s2_pico.name=LOLIN S2 PICO
+lolin_s2_pico.vid.0=0x303a
+lolin_s2_pico.pid.0=0x80C5
+
+lolin_s2_pico.upload.tool=esptool_py
+lolin_s2_pico.upload.maximum_size=1310720
+lolin_s2_pico.upload.maximum_data_size=327680
+lolin_s2_pico.upload.flags=
+lolin_s2_pico.upload.extra_flags=
+lolin_s2_pico.upload.use_1200bps_touch=true
+lolin_s2_pico.upload.wait_for_upload_port=true
+lolin_s2_pico.upload.speed=921600
+
+lolin_s2_pico.serial.disableDTR=false
+lolin_s2_pico.serial.disableRTS=false
+
+lolin_s2_pico.build.tarch=xtensa
+lolin_s2_pico.build.bootloader_addr=0x1000
+lolin_s2_pico.build.target=esp32s2
+lolin_s2_pico.build.mcu=esp32s2
+lolin_s2_pico.build.core=esp32
+lolin_s2_pico.build.variant=lolin_s2_pico
+lolin_s2_pico.build.board=LOLIN_S2_PICO
+
+lolin_s2_pico.build.cdc_on_boot=1
+lolin_s2_pico.build.msc_on_boot=1
+lolin_s2_pico.build.dfu_on_boot=1
+lolin_s2_pico.build.f_cpu=240000000L
+lolin_s2_pico.build.flash_size=4MB
+lolin_s2_pico.build.flash_freq=80m
+lolin_s2_pico.build.flash_mode=dio
+lolin_s2_pico.build.boot=qio
+lolin_s2_pico.build.partitions=default
+lolin_s2_pico.build.defines=
+
+lolin_s2_pico.build.defines=-DBOARD_HAS_PSRAM
+
+lolin_s2_pico.menu.CDCOnBoot.default=Enabled
+lolin_s2_pico.menu.CDCOnBoot.default.build.cdc_on_boot=1
+lolin_s2_pico.menu.CDCOnBoot.dis_cdc=Disabled
+lolin_s2_pico.menu.CDCOnBoot.dis_cdc.build.cdc_on_boot=0
+
+lolin_s2_pico.menu.MSCOnBoot.default=Disabled
+lolin_s2_pico.menu.MSCOnBoot.default.build.msc_on_boot=0
+lolin_s2_pico.menu.MSCOnBoot.msc=Enabled
+lolin_s2_pico.menu.MSCOnBoot.msc.build.msc_on_boot=1
+
+lolin_s2_pico.menu.DFUOnBoot.default=Disabled
+lolin_s2_pico.menu.DFUOnBoot.default.build.dfu_on_boot=0
+lolin_s2_pico.menu.DFUOnBoot.dfu=Enabled
+lolin_s2_pico.menu.DFUOnBoot.dfu.build.dfu_on_boot=1
+
+lolin_s2_pico.menu.PartitionScheme.default=Default 4MB with spiffs (1.2MB APP/1.5MB SPIFFS)
+lolin_s2_pico.menu.PartitionScheme.default.build.partitions=default
+lolin_s2_pico.menu.PartitionScheme.defaultffat=Default 4MB with ffat (1.2MB APP/1.5MB FATFS)
+lolin_s2_pico.menu.PartitionScheme.defaultffat.build.partitions=default_ffat
+lolin_s2_pico.menu.PartitionScheme.no_ota=No OTA (2MB APP/2MB SPIFFS)
+lolin_s2_pico.menu.PartitionScheme.no_ota.build.partitions=no_ota
+lolin_s2_pico.menu.PartitionScheme.no_ota.upload.maximum_size=2097152
+lolin_s2_pico.menu.PartitionScheme.noota_3g=No OTA (1MB APP/3MB SPIFFS)
+lolin_s2_pico.menu.PartitionScheme.noota_3g.build.partitions=noota_3g
+lolin_s2_pico.menu.PartitionScheme.noota_3g.upload.maximum_size=1048576
+lolin_s2_pico.menu.PartitionScheme.noota_ffat=No OTA (2MB APP/2MB FATFS)
+lolin_s2_pico.menu.PartitionScheme.noota_ffat.build.partitions=noota_ffat
+lolin_s2_pico.menu.PartitionScheme.noota_ffat.upload.maximum_size=2097152
+lolin_s2_pico.menu.PartitionScheme.noota_3gffat=No OTA (1MB APP/3MB FATFS)
+lolin_s2_pico.menu.PartitionScheme.noota_3gffat.build.partitions=noota_3gffat
+lolin_s2_pico.menu.PartitionScheme.noota_3gffat.upload.maximum_size=1048576
+lolin_s2_pico.menu.PartitionScheme.huge_app=Huge APP (3MB No OTA/1MB SPIFFS)
+lolin_s2_pico.menu.PartitionScheme.huge_app.build.partitions=huge_app
+lolin_s2_pico.menu.PartitionScheme.huge_app.upload.maximum_size=3145728
+
+lolin_s2_pico.menu.DebugLevel.none=None
+lolin_s2_pico.menu.DebugLevel.none.build.code_debug=0
+lolin_s2_pico.menu.DebugLevel.error=Error
+lolin_s2_pico.menu.DebugLevel.error.build.code_debug=1
+lolin_s2_pico.menu.DebugLevel.warn=Warn
+lolin_s2_pico.menu.DebugLevel.warn.build.code_debug=2
+lolin_s2_pico.menu.DebugLevel.info=Info
+lolin_s2_pico.menu.DebugLevel.info.build.code_debug=3
+lolin_s2_pico.menu.DebugLevel.debug=Debug
+lolin_s2_pico.menu.DebugLevel.debug.build.code_debug=4
+lolin_s2_pico.menu.DebugLevel.verbose=Verbose
+lolin_s2_pico.menu.DebugLevel.verbose.build.code_debug=5
+
+##############################################################
+
 lolin32.name=WEMOS LOLIN32
 
 lolin32.upload.tool=esptool_py
diff --git a/variants/lolin_s2_pico/pins_arduino.h b/variants/lolin_s2_pico/pins_arduino.h
new file mode 100644
index 00000000000..10f0a9e7987
--- /dev/null
+++ b/variants/lolin_s2_pico/pins_arduino.h
@@ -0,0 +1,84 @@
+#ifndef Pins_Arduino_h
+#define Pins_Arduino_h
+
+#include <stdint.h>
+
+// Default USB Settings
+#define USB_VID 			0x303a
+#define USB_PID 			0x80C5
+#define USB_MANUFACTURER 	"WEMOS.CC"
+#define USB_PRODUCT 		"LOLIN-S2-PICO"
+#define USB_SERIAL 			"0"
+
+
+// Default USB FirmwareMSC Settings
+#define USB_FW_MSC_VENDOR_ID 		"ESP32-S2" 		//max 8 chars
+#define USB_FW_MSC_PRODUCT_ID 		"Firmware MSC"	//max 16 chars
+#define USB_FW_MSC_PRODUCT_REVISION	"1.23" 			//max 4 chars
+#define USB_FW_MSC_VOLUME_NAME 		"S2-Firmware" 	//max 11 chars
+#define USB_FW_MSC_SERIAL_NUMBER 	0x00000000
+
+#define EXTERNAL_NUM_INTERRUPTS 46
+#define NUM_DIGITAL_PINS        48
+#define NUM_ANALOG_INPUTS       20
+
+#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<48)?(p):-1)
+#define digitalPinHasPWM(p)         (p < 46)
+
+static const uint8_t LED_BUILTIN = 10;
+#define BUILTIN_LED  LED_BUILTIN // backward compatibility
+
+static const uint8_t TX = 38;
+static const uint8_t RX = 33;
+
+static const uint8_t SDA = 8;
+static const uint8_t SCL = 9;
+
+static const uint8_t SS    = 34;
+static const uint8_t MOSI  = 35;
+static const uint8_t MISO  = 37;
+static const uint8_t SCK   = 36;
+
+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 A18 = 19;
+static const uint8_t A19 = 20;
+
+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;
+
+static const uint8_t DAC1 = 17;
+static const uint8_t DAC2 = 18;
+
+static const uint8_t S2_PICO_OLED_RESET = 18; 
+
+#endif /* Pins_Arduino_h */