diff --git a/boards.txt b/boards.txt
index a5dd94a75e6..e5ee66efe29 100644
--- a/boards.txt
+++ b/boards.txt
@@ -2119,6 +2119,50 @@ heltec_wifi_lora_32.menu.UploadSpeed.512000.upload.speed=512000
 
 ##############################################################
 
+heltec_wifi_lora_32_V2.name=Heltec_WIFI_LoRa_32_V2
+
+heltec_wifi_lora_32_V2.upload.tool=esptool_py
+heltec_wifi_lora_32_V2.upload.maximum_size=3342336
+heltec_wifi_lora_32_V2.upload.maximum_data_size=327680
+heltec_wifi_lora_32_V2.upload.wait_for_upload_port=true
+
+heltec_wifi_lora_32_V2.serial.disableDTR=true
+heltec_wifi_lora_32_V2.serial.disableRTS=true
+
+heltec_wifi_lora_32_V2.build.mcu=esp32
+heltec_wifi_lora_32_V2.build.core=esp32
+heltec_wifi_lora_32_V2.build.variant=heltec_wifi_lora_32_V2
+heltec_wifi_lora_32_V2.build.board=Heltec_WIFI_LoRa_32_V2
+
+heltec_wifi_lora_32_V2.build.f_cpu=240000000L
+heltec_wifi_lora_32_V2.build.flash_mode=dio
+heltec_wifi_lora_32_V2.build.flash_size=8MB
+heltec_wifi_lora_32_V2.build.boot=dio
+heltec_wifi_lora_32_V2.build.partitions=default_8MB
+heltec_wifi_lora_32_V2.build.defines=
+
+heltec_wifi_lora_32_V2.menu.FlashFreq.80=80MHz
+heltec_wifi_lora_32_V2.menu.FlashFreq.80.build.flash_freq=80m
+heltec_wifi_lora_32_V2.menu.FlashFreq.40=40MHz
+heltec_wifi_lora_32_V2.menu.FlashFreq.40.build.flash_freq=40m
+
+heltec_wifi_lora_32_V2.menu.UploadSpeed.921600=921600
+heltec_wifi_lora_32_V2.menu.UploadSpeed.921600.upload.speed=921600
+heltec_wifi_lora_32_V2.menu.UploadSpeed.115200=115200
+heltec_wifi_lora_32_V2.menu.UploadSpeed.115200.upload.speed=115200
+heltec_wifi_lora_32_V2.menu.UploadSpeed.256000.windows=256000
+heltec_wifi_lora_32_V2.menu.UploadSpeed.256000.upload.speed=256000
+heltec_wifi_lora_32_V2.menu.UploadSpeed.230400.windows.upload.speed=256000
+heltec_wifi_lora_32_V2.menu.UploadSpeed.230400=230400
+heltec_wifi_lora_32_V2.menu.UploadSpeed.230400.upload.speed=230400
+heltec_wifi_lora_32_V2.menu.UploadSpeed.460800.linux=460800
+heltec_wifi_lora_32_V2.menu.UploadSpeed.460800.macosx=460800
+heltec_wifi_lora_32_V2.menu.UploadSpeed.460800.upload.speed=460800
+heltec_wifi_lora_32_V2.menu.UploadSpeed.512000.windows=512000
+heltec_wifi_lora_32_V2.menu.UploadSpeed.512000.upload.speed=512000
+
+##############################################################
+
 espectro32.name=ESPectro32
 
 espectro32.upload.tool=esptool_py
@@ -2844,4 +2888,3 @@ fm-devkit.menu.DebugLevel.debug=Debug
 fm-devkit.menu.DebugLevel.debug.build.code_debug=4
 fm-devkit.menu.DebugLevel.verbose=Verbose
 fm-devkit.menu.DebugLevel.verbose.build.code_debug=5
-
diff --git a/tools/partitions/default_8MB.csv b/tools/partitions/default_8MB.csv
new file mode 100644
index 00000000000..b78b780d25b
--- /dev/null
+++ b/tools/partitions/default_8MB.csv
@@ -0,0 +1,7 @@
+# Name,   Type, SubType, Offset,  Size, Flags
+nvs,      data, nvs,     0x9000,  0x5000,
+otadata,  data, ota,     0xe000,  0x2000,
+app0,     app,  ota_0,   0x10000, 0x330000,
+app1,     app,  ota_1,   0x340000,0x330000,
+eeprom,   data, 0x99,    0x670000,0x1000,
+spiffs,   data, spiffs,  0x671000,0x18F000,
diff --git a/variants/heltec_wifi_lora_32_V2/pins_arduino.h b/variants/heltec_wifi_lora_32_V2/pins_arduino.h
new file mode 100644
index 00000000000..1edbf8c8a84
--- /dev/null
+++ b/variants/heltec_wifi_lora_32_V2/pins_arduino.h
@@ -0,0 +1,85 @@
+#ifndef Pins_Arduino_h
+#define Pins_Arduino_h
+
+#include <stdint.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 = 25;
+#define BUILTIN_LED  LED_BUILTIN // backward compatibility
+
+static const uint8_t KEY_BUILTIN = 0;
+
+static const uint8_t TX = 1;
+static const uint8_t RX = 3;
+
+static const uint8_t SDA = 4;
+static const uint8_t SCL = 15;
+
+static const uint8_t SS    = 18;
+static const uint8_t MOSI  = 27;
+static const uint8_t MISO  = 19;
+static const uint8_t SCK   = 5;
+
+static const uint8_t A0 = 36;
+static const uint8_t A1 = 37;
+static const uint8_t A2 = 38;
+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;
+
+// OLed
+static const uint8_t OLED_SCL = 15;
+static const uint8_t OLED_SDA = 4;
+static const uint8_t OLED_RST = 16;
+
+// LoRA
+static const uint8_t LORA_SCK = 5;
+static const uint8_t LORA_MOSI = 27;
+static const uint8_t LORA_MISO = 19;
+static const uint8_t LORA_CS = 18;
+static const uint8_t LORA_RST = 14;
+static const uint8_t LORA_IRQ = 26;
+static const uint8_t LORA_DIO1 = 35;
+static const uint8_t LORA_DIO2 = 34;
+
+//Vext Power Control
+static const uint8_t VEXT_CNTRL = 21;
+
+// PRG Button
+static const uint8_t PRG_BUTTON = 0;
+
+#endif /* Pins_Arduino_h */