diff --git a/boards.txt b/boards.txt
index d53855a808b..8d5f3c9037a 100644
--- a/boards.txt
+++ b/boards.txt
@@ -422,3 +422,44 @@ hornbill32minima.menu.UploadSpeed.460800.macosx=460800
 hornbill32minima.menu.UploadSpeed.460800.upload.speed=460800
 hornbill32minima.menu.UploadSpeed.512000.windows=512000
 hornbill32minima.menu.UploadSpeed.512000.upload.speed=512000
+
+##############################################################
+
+firebeetle32.name=FireBeetle-ESP32
+
+firebeetle32.upload.tool=esptool
+firebeetle32.upload.maximum_size=1044464
+firebeetle32.upload.maximum_data_size=294912
+firebeetle32.upload.wait_for_upload_port=true
+
+firebeetle32.serial.disableDTR=true
+firebeetle32.serial.disableRTS=true
+
+firebeetle32.build.mcu=esp32
+firebeetle32.build.core=esp32
+firebeetle32.build.variant=firebeetle32
+firebeetle32.build.board=ESP32_DEV
+
+firebeetle32.build.f_cpu=240000000L
+firebeetle32.build.flash_mode=dio
+firebeetle32.build.flash_size=4MB
+
+firebeetle32.menu.FlashFreq.80=80MHz
+firebeetle32.menu.FlashFreq.80.build.flash_freq=80m
+firebeetle32.menu.FlashFreq.40=40MHz
+firebeetle32.menu.FlashFreq.40.build.flash_freq=40m
+
+firebeetle32.menu.UploadSpeed.921600=921600
+firebeetle32.menu.UploadSpeed.921600.upload.speed=921600
+firebeetle32.menu.UploadSpeed.115200=115200
+firebeetle32.menu.UploadSpeed.115200.upload.speed=115200
+firebeetle32.menu.UploadSpeed.256000.windows=256000
+firebeetle32.menu.UploadSpeed.256000.upload.speed=256000
+firebeetle32.menu.UploadSpeed.230400.windows.upload.speed=256000
+firebeetle32.menu.UploadSpeed.230400=230400
+firebeetle32.menu.UploadSpeed.230400.upload.speed=230400
+firebeetle32.menu.UploadSpeed.460800.linux=460800
+firebeetle32.menu.UploadSpeed.460800.macosx=460800
+firebeetle32.menu.UploadSpeed.460800.upload.speed=460800
+firebeetle32.menu.UploadSpeed.512000.windows=512000
+firebeetle32.menu.UploadSpeed.512000.upload.speed=512000
diff --git a/variants/firebeetle32/pins_arduino.h b/variants/firebeetle32/pins_arduino.h
new file mode 100644
index 00000000000..e5cc7f09266
--- /dev/null
+++ b/variants/firebeetle32/pins_arduino.h
@@ -0,0 +1,59 @@
+#ifndef Pins_Arduino_h
+#define Pins_Arduino_h
+
+#define EXTERNAL_NUM_INTERRUPTS 16
+#define NUM_DIGITAL_PINS        40
+#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 LED_BUILTIN = 2;
+#define BUILTIN_LED  LED_BUILTIN // backward compatibility
+
+
+
+static const uint8_t TX = 1;
+static const uint8_t RX = 3;
+
+static const uint8_t SDA = 21;
+static const uint8_t SCL = 22;
+
+static const uint8_t SS    = 5;
+static const uint8_t MOSI  = 23;
+static const uint8_t MISO  = 19;
+static const uint8_t SCK   = 18;
+
+static const uint8_t A0 = 36;
+static const uint8_t A3 = 39;
+static const uint8_t A4 = 32;
+static const uint8_t A5 = 33;
+static const uint8_t A6 = 34;
+static const uint8_t A7 = 35;
+static const uint8_t A10 = 4;
+static const uint8_t A11 = 0;
+static const uint8_t A12 = 2;
+static const uint8_t A13 = 15;
+static const uint8_t A14 = 13;
+static const uint8_t A15 = 12;
+static const uint8_t A16 = 14;
+static const uint8_t A17 = 27;
+static const uint8_t A18 = 25;
+static const uint8_t A19 = 26;
+
+static const uint8_t T0 = 4;
+static const uint8_t T1 = 0;
+static const uint8_t T2 = 2;
+static const uint8_t T3 = 15;
+static const uint8_t T4 = 13;
+static const uint8_t T5 = 12;
+static const uint8_t T6 = 14;
+static const uint8_t T7 = 27;
+static const uint8_t T8 = 33;
+static const uint8_t T9 = 32;
+
+static const uint8_t DAC1 = 25;
+static const uint8_t DAC2 = 26;
+
+#endif /* Pins_Arduino_h */