diff --git a/boards.txt b/boards.txt
index ae77fb7f8da4240c5438b1e2a8df8141f89db533..de34e530f847070bc661d23951c18c510ff5ddf6 100644
--- a/boards.txt
+++ b/boards.txt
@@ -9916,6 +9916,96 @@ m5stack-fire.menu.DebugLevel.verbose.build.code_debug=5
 
 ##############################################################
 
+m5stack-station.name=M5Stack-Station
+
+m5stack-station.bootloader.tool=esptool_py
+m5stack-station.bootloader.tool.default=esptool_py
+
+m5stack-station.upload.tool=esptool_py
+m5stack-station.upload.tool.default=esptool_py
+m5stack-station.upload.tool.network=esp_ota
+
+m5stack-station.upload.maximum_size=6553600
+m5stack-station.upload.maximum_data_size=4521984
+m5stack-station.upload.flags=
+m5stack-station.upload.extra_flags=
+
+m5stack-station.serial.disableDTR=true
+m5stack-station.serial.disableRTS=true
+
+m5stack-station.build.tarch=xtensa
+m5stack-station.build.bootloader_addr=0x1000
+m5stack-station.build.target=esp32
+m5stack-station.build.mcu=esp32
+m5stack-station.build.core=esp32
+m5stack-station.build.variant=m5stack_station
+m5stack-station.build.board=M5Stack_Station
+
+m5stack-station.build.f_cpu=240000000L
+m5stack-station.build.flash_size=16MB
+m5stack-station.build.flash_freq=80m
+m5stack-station.build.flash_mode=dio
+m5stack-station.build.boot=dio
+m5stack-station.build.partitions=default_16MB
+m5stack-station.build.defines=
+
+m5stack-station.menu.PartitionScheme.default=Default
+m5stack-station.menu.PartitionScheme.default.build.partitions=default_16MB
+m5stack-station.menu.PartitionScheme.no_ota=No OTA (Large APP)
+m5stack-station.menu.PartitionScheme.no_ota.build.partitions=no_ota
+m5stack-station.menu.PartitionScheme.no_ota.upload.maximum_size=6553600
+m5stack-station.menu.PartitionScheme.min_spiffs=Minimal SPIFFS (Large APPS with OTA)
+m5stack-station.menu.PartitionScheme.min_spiffs.build.partitions=min_spiffs
+m5stack-station.menu.PartitionScheme.min_spiffs.upload.maximum_size=1966080
+
+m5stack-station.menu.CPUFreq.240=240MHz (WiFi/BT)
+m5stack-station.menu.CPUFreq.240.build.f_cpu=240000000L
+m5stack-station.menu.CPUFreq.160=160MHz (WiFi/BT)
+m5stack-station.menu.CPUFreq.160.build.f_cpu=160000000L
+m5stack-station.menu.CPUFreq.80=80MHz (WiFi/BT)
+m5stack-station.menu.CPUFreq.80.build.f_cpu=80000000L
+m5stack-station.menu.CPUFreq.40=40MHz (40MHz XTAL)
+m5stack-station.menu.CPUFreq.40.build.f_cpu=40000000L
+m5stack-station.menu.CPUFreq.26=26MHz (26MHz XTAL)
+m5stack-station.menu.CPUFreq.26.build.f_cpu=26000000L
+m5stack-station.menu.CPUFreq.20=20MHz (40MHz XTAL)
+m5stack-station.menu.CPUFreq.20.build.f_cpu=20000000L
+m5stack-station.menu.CPUFreq.13=13MHz (26MHz XTAL)
+m5stack-station.menu.CPUFreq.13.build.f_cpu=13000000L
+m5stack-station.menu.CPUFreq.10=10MHz (40MHz XTAL)
+m5stack-station.menu.CPUFreq.10.build.f_cpu=10000000L
+
+m5stack-station.menu.UploadSpeed.1500000=1500000
+m5stack-station.menu.UploadSpeed.1500000.upload.speed=1500000
+m5stack-station.menu.UploadSpeed.750000=750000
+m5stack-station.menu.UploadSpeed.750000.upload.speed=750000
+m5stack-station.menu.UploadSpeed.500000=500000
+m5stack-station.menu.UploadSpeed.500000.upload.speed=500000
+m5stack-station.menu.UploadSpeed.250000=250000
+m5stack-station.menu.UploadSpeed.250000.upload.speed=250000
+m5stack-station.menu.UploadSpeed.115200=115200
+m5stack-station.menu.UploadSpeed.115200.upload.speed=115200
+
+m5stack-station.menu.DebugLevel.none=None
+m5stack-station.menu.DebugLevel.none.build.code_debug=0
+m5stack-station.menu.DebugLevel.error=Error
+m5stack-station.menu.DebugLevel.error.build.code_debug=1
+m5stack-station.menu.DebugLevel.warn=Warn
+m5stack-station.menu.DebugLevel.warn.build.code_debug=2
+m5stack-station.menu.DebugLevel.info=Info
+m5stack-station.menu.DebugLevel.info.build.code_debug=3
+m5stack-station.menu.DebugLevel.debug=Debug
+m5stack-station.menu.DebugLevel.debug.build.code_debug=4
+m5stack-station.menu.DebugLevel.verbose=Verbose
+m5stack-station.menu.DebugLevel.verbose.build.code_debug=5
+
+m5stack-station.menu.EraseFlash.none=Disabled
+m5stack-station.menu.EraseFlash.none.upload.erase_cmd=
+m5stack-station.menu.EraseFlash.all=Enabled
+m5stack-station.menu.EraseFlash.all.upload.erase_cmd=-e
+
+##############################################################
+
 m5stick-c.name=M5Stick-C
 
 m5stick-c.bootloader.tool=esptool_py
diff --git a/variants/m5stack_station/pins_arduino.h b/variants/m5stack_station/pins_arduino.h
new file mode 100644
index 0000000000000000000000000000000000000000..2cee4ee8b34bc17d367e100ec5c4fa9a23dde6fa
--- /dev/null
+++ b/variants/m5stack_station/pins_arduino.h
@@ -0,0 +1,58 @@
+#ifndef Pins_Arduino_h
+#define Pins_Arduino_h
+
+#include <stdint.h>
+
+#define EXTERNAL_NUM_INTERRUPTS 16
+#define NUM_DIGITAL_PINS        20
+#define NUM_ANALOG_INPUTS       16
+
+#define analogInputToDigitalPin(p) (((p) < 20) ? (esp32_adc2gpio[(p)]) : -1)
+#define digitalPinToInterrupt(p)   (((p) < 40) ? (p) : -1)
+#define digitalPinHasPWM(p)        (p < 34)
+
+static const uint8_t TX = 1;
+static const uint8_t RX = 3;
+
+static const uint8_t TXD1 = 14;
+static const uint8_t RXD1 = 13;
+
+static const uint8_t TXD2 = 17;
+static const uint8_t RXD2 = 16;
+
+static const uint8_t SDA = 32;
+static const uint8_t SCL = 33;
+
+static const uint8_t SS   = 5;
+static const uint8_t MOSI = 23;
+static const uint8_t MISO = -1;
+static const uint8_t SCK  = 18;
+
+static const uint8_t G1  = 1;
+static const uint8_t G3  = 3;
+static const uint8_t G4  = 4;
+static const uint8_t G5  = 5;
+static const uint8_t G13 = 13;
+static const uint8_t G14 = 14;
+static const uint8_t G16 = 16;
+static const uint8_t G17 = 17;
+static const uint8_t G18 = 18;
+static const uint8_t G19 = 19;
+static const uint8_t G23 = 23;
+static const uint8_t G25 = 25;
+static const uint8_t G26 = 26;
+static const uint8_t G32 = 32;
+static const uint8_t G33 = 33;
+static const uint8_t G35 = 35;
+static const uint8_t G36 = 36;
+static const uint8_t G37 = 37;
+static const uint8_t G38 = 38;
+static const uint8_t G39 = 39;
+
+static const uint8_t DAC1 = 25;
+static const uint8_t DAC2 = 26;
+
+static const uint8_t ADC1 = 35;
+static const uint8_t ADC2 = 36;
+
+#endif /* Pins_Arduino_h */